diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 2a44b6f..01788bc 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,4 @@
 import { BreakpointObserver, Breakpoints } from '@angular/cdk/layout';
-import { CommonModule } from '@angular/common';
 import { Component, signal, inject } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
@@ -22,7 +21,6 @@ const mobileBreakpoints = [Breakpoints.Handset, Breakpoints.TabletPortrait];
   templateUrl: './app.component.html',
   styleUrl: './app.component.scss',
   imports: [
-    CommonModule,
     EditorComponent,
     FileTreeComponent,
     MatButtonModule,
diff --git a/src/app/editor/editor.component.html b/src/app/editor/editor.component.html
index b13c18e..90c4200 100644
--- a/src/app/editor/editor.component.html
+++ b/src/app/editor/editor.component.html
@@ -7,7 +7,7 @@
 <div class="editor-items">
   @if(values()) { @for (item of selectedMessage().values; track $index) {
   <app-proto-field
-    [label]="item.name"
+    [label]="item.friendlyName || item.name"
     [configuration]="item.configuration"
     [value]="values()[item.name]"
     (valueChange)="updateValue(item.name, $event)"
diff --git a/src/app/editor/editor.component.ts b/src/app/editor/editor.component.ts
index 0777718..60f4c7d 100644
--- a/src/app/editor/editor.component.ts
+++ b/src/app/editor/editor.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -31,7 +30,6 @@ type PreviewType = 'raw' | 'edit' | 'diff';
 @Component({
   selector: 'app-editor',
   imports: [
-    CommonModule,
     ProtoFieldComponent,
     MatButtonModule,
     MatButtonToggleModule,
@@ -102,17 +100,14 @@ export class EditorComponent {
         }
       }
     });
-    effect(
-      () => {
-        const message = this.selectedMessage();
-        this.values.set(
-          Object.fromEntries(
-            message.values.map((value) => [[value.name, undefined]])
-          )
-        );
-      },
-      { allowSignalWrites: true }
-    );
+    effect(() => {
+      const message = this.selectedMessage();
+      this.values.set(
+        Object.fromEntries(
+          message.values.map((value) => [[value.name, undefined]])
+        )
+      );
+    });
 
     effect(async () => {
       const selectedFile = this.selectedFile();
diff --git a/src/app/editor/list-field/list-field.component.ts b/src/app/editor/list-field/list-field.component.ts
index 4ee3b73..e20b948 100644
--- a/src/app/editor/list-field/list-field.component.ts
+++ b/src/app/editor/list-field/list-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -14,14 +13,13 @@ import { ListMessage } from '../../model/proto-message.model';
 import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 
 @Component({
-    selector: 'app-list-field',
-    imports: [
-        CommonModule,
-        MatButtonModule,
-        MatIconModule,
-        forwardRef(() => ProtoFieldComponent),
-    ],
-    template: `<h3>{{ label() }}</h3>
+  selector: 'app-list-field',
+  imports: [
+    MatButtonModule,
+    MatIconModule,
+    forwardRef(() => ProtoFieldComponent),
+  ],
+  template: `<h3>{{ label() }}</h3>
     @if(values()) { @for(value of values(); track $index) {
     <div class="row-wrapper">
       <app-proto-field
@@ -37,8 +35,8 @@ import { ProtoFieldComponent } from '../proto-field/proto-field.component';
     <button mat-icon-button class="add-button" (click)="add()">
       <mat-icon>add</mat-icon>
     </button>`,
-    styleUrl: './list-field.component.scss',
-    changeDetection: ChangeDetectionStrategy.OnPush
+  styleUrl: './list-field.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ListFieldComponent {
   label = input<string>();
diff --git a/src/app/editor/map-field/map-field.component.ts b/src/app/editor/map-field/map-field.component.ts
index 5a840ab..31d761e 100644
--- a/src/app/editor/map-field/map-field.component.ts
+++ b/src/app/editor/map-field/map-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -16,14 +15,13 @@ import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 const keyIsEmpty = (key: string | number) => key == null || key === '';
 
 @Component({
-    selector: 'app-map-field',
-    imports: [
-        CommonModule,
-        forwardRef(() => ProtoFieldComponent),
-        MatIconModule,
-        MatButtonModule,
-    ],
-    template: `<h3>{{ label() }}</h3>
+  selector: 'app-map-field',
+  imports: [
+    forwardRef(() => ProtoFieldComponent),
+    MatIconModule,
+    MatButtonModule,
+  ],
+  template: `<h3>{{ label() }}</h3>
     @if(valuePairs()) { @for(value of valuePairs(); track $index) {
     <div class="row-wrapper">
       <app-proto-field
@@ -44,8 +42,8 @@ const keyIsEmpty = (key: string | number) => key == null || key === '';
     <button mat-icon-button class="add-button" (click)="add()">
       <mat-icon>add</mat-icon>
     </button>`,
-    styleUrl: './map-field.component.scss',
-    changeDetection: ChangeDetectionStrategy.OnPush
+  styleUrl: './map-field.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MapFieldComponent {
   label = input<string>();
@@ -57,22 +55,19 @@ export class MapFieldComponent {
   private changedInternal = false;
 
   constructor() {
-    effect(
-      () => {
-        // TODO: Super hacky but can't really think of another way to keep these in sync
-        //    without removing an entry when the key gets blanked. Would need an alternate
-        //    design that updated on blur only perhaps
-        if (this.changedInternal) {
-          this.changedInternal = false;
-          return;
-        }
-        const values = this.values();
-        if (values) {
-          this.valuePairs.set(Object.entries(values));
-        }
-      },
-      { allowSignalWrites: true }
-    );
+    effect(() => {
+      // TODO: Super hacky but can't really think of another way to keep these in sync
+      //    without removing an entry when the key gets blanked. Would need an alternate
+      //    design that updated on blur only perhaps
+      if (this.changedInternal) {
+        this.changedInternal = false;
+        return;
+      }
+      const values = this.values();
+      if (values) {
+        this.valuePairs.set(Object.entries(values));
+      }
+    });
   }
 
   add() {
diff --git a/src/app/editor/object-field/object-field.component.ts b/src/app/editor/object-field/object-field.component.ts
index 725af8d..4c8a670 100644
--- a/src/app/editor/object-field/object-field.component.ts
+++ b/src/app/editor/object-field/object-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -11,23 +10,23 @@ import { ObjectMessage } from '../../model/proto-message.model';
 import { ProtoFieldComponent } from '../proto-field/proto-field.component';
 
 @Component({
-    selector: 'app-object-field',
-    imports: [CommonModule, forwardRef(() => ProtoFieldComponent)],
-    template: `<h3>
+  selector: 'app-object-field',
+  imports: [forwardRef(() => ProtoFieldComponent)],
+  template: `<h3>
       {{ label() }} ({{ configuration().messageDefinition.name }})
     </h3>
     <div>
       @for (item of configuration().messageDefinition.values; track $index) {
       <app-proto-field
-        [label]="item.name"
+        [label]="item.friendlyName || item.name"
         [configuration]="item.configuration"
         [value]="currentValue()[item.name]"
         (valueChange)="updateValue(item.name, $event)"
       ></app-proto-field>
       }
     </div>`,
-    styleUrl: './object-field.component.scss',
-    changeDetection: ChangeDetectionStrategy.OnPush
+  styleUrl: './object-field.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ObjectFieldComponent {
   label = input<string>();
diff --git a/src/app/editor/proto-field/proto-field.component.ts b/src/app/editor/proto-field/proto-field.component.ts
index a40ecbf..4a1fca2 100644
--- a/src/app/editor/proto-field/proto-field.component.ts
+++ b/src/app/editor/proto-field/proto-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -27,20 +26,19 @@ import { ObjectFieldComponent } from '../object-field/object-field.component';
 import { StringFieldComponent } from '../string-field/string-field.component';
 
 @Component({
-    selector: 'app-proto-field',
-    imports: [
-        CommonModule,
-        FormsModule,
-        ListFieldComponent,
-        MapFieldComponent,
-        MatCheckboxModule,
-        MatFormFieldModule,
-        MatSelectModule,
-        MatInputModule,
-        ObjectFieldComponent,
-        StringFieldComponent,
-    ],
-    template: `@switch (configuration().type) { @case (MessageTypeEnum.String) {
+  selector: 'app-proto-field',
+  imports: [
+    FormsModule,
+    ListFieldComponent,
+    MapFieldComponent,
+    MatCheckboxModule,
+    MatFormFieldModule,
+    MatSelectModule,
+    MatInputModule,
+    ObjectFieldComponent,
+    StringFieldComponent,
+  ],
+  template: `@switch (configuration().type) { @case (MessageTypeEnum.String) {
     <app-string-field
       [label]="label()"
       [configuration]="stringConfiguration()"
@@ -57,14 +55,17 @@ import { StringFieldComponent } from '../string-field/string-field.component';
         [min]="numericConfiguration().min ?? null"
         [max]="numericConfiguration().max ?? null"
       />
-      <mat-hint *ngIf="number.hasError('min')"
+      @if(number.hasError('min')) {
+      <mat-hint
         >Number should not be less than
         {{ numericConfiguration().min }}</mat-hint
       >
-      <mat-hint *ngIf="number.hasError('max')"
+      } @if(number.hasError('max')) {
+      <mat-hint
         >Number should not greater than
         {{ numericConfiguration().max }}</mat-hint
       >
+      }
     </mat-form-field>
     } @case (MessageTypeEnum.Boolean) {
     <p>
@@ -74,10 +75,11 @@ import { StringFieldComponent } from '../string-field/string-field.component';
     <mat-form-field>
       <mat-label>{{ label() }}</mat-label>
       <mat-select [(value)]="value">
-        @for(option of enumConfiguration().options; track
-        enumConfiguration()!.options) {
         <mat-option>None</mat-option>
-        <mat-option [value]="option">{{ option }}</mat-option>
+        @for(option of enumConfiguration().options; track option) {
+        <mat-option [value]="option">{{
+          option.friendlyName || option.protoName
+        }}</mat-option>
         }
       </mat-select>
     </mat-form-field>
@@ -100,8 +102,8 @@ import { StringFieldComponent } from '../string-field/string-field.component';
       [configuration]="objectConfiguration()"
     ></app-object-field>
     } @case (MessageTypeEnum.Raw) {}}`,
-    styleUrl: './proto-field.component.scss',
-    changeDetection: ChangeDetectionStrategy.OnPush
+  styleUrl: './proto-field.component.scss',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ProtoFieldComponent {
   label = input<string>();
diff --git a/src/app/editor/string-field/string-field.component.ts b/src/app/editor/string-field/string-field.component.ts
index 6e04ecd..f75d3ad 100644
--- a/src/app/editor/string-field/string-field.component.ts
+++ b/src/app/editor/string-field/string-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -12,15 +11,14 @@ import { MatInputModule } from '@angular/material/input';
 import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
 
 @Component({
-    selector: 'app-string-field',
-    imports: [
-        CommonModule,
-        FormsModule,
-        MatFormFieldModule,
-        MatInputModule,
-        MonacoEditorModule,
-    ],
-    template: ` @if(configuration().textType === 'text') {
+  selector: 'app-string-field',
+  imports: [
+    FormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    MonacoEditorModule,
+  ],
+  template: ` @if(configuration().textType === 'text') {
     <mat-form-field>
       <mat-label>{{ label() }}</mat-label>
       <input
@@ -43,8 +41,8 @@ import { MonacoEditorModule } from 'ngx-monaco-editor-v2';
       [options]="editorOptions"
     ></ngx-monaco-editor>
     }`,
-    styleUrl: './string-field.component.css',
-    changeDetection: ChangeDetectionStrategy.OnPush
+  styleUrl: './string-field.component.css',
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class StringFieldComponent {
   label = input();
diff --git a/src/app/file-tree/file-tree.component.ts b/src/app/file-tree/file-tree.component.ts
index 8b424bb..c4a274d 100644
--- a/src/app/file-tree/file-tree.component.ts
+++ b/src/app/file-tree/file-tree.component.ts
@@ -1,5 +1,4 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { CommonModule } from '@angular/common';
 import {
   Component,
   ElementRef,
@@ -40,7 +39,7 @@ const collator = new Intl.Collator(undefined, { numeric: true });
 
 @Component({
   selector: 'app-file-tree',
-  imports: [CommonModule, MatButtonModule, MatIconModule, MatTreeModule],
+  imports: [MatButtonModule, MatIconModule, MatTreeModule],
   templateUrl: './file-tree.component.html',
   styleUrl: './file-tree.component.scss',
 })
diff --git a/src/app/model/proto-message.model.ts b/src/app/model/proto-message.model.ts
index 6e2a26f..58972f9 100644
--- a/src/app/model/proto-message.model.ts
+++ b/src/app/model/proto-message.model.ts
@@ -38,8 +38,13 @@ export interface ObjectMessage extends MessageConfiguration {
 
 export interface RawMessage extends MessageConfiguration {}
 
+export interface EnumMessageOption {
+  protoName: string;
+  friendlyName?: string;
+}
+
 export interface EnumMessage extends MessageConfiguration {
-  options: string[];
+  options: EnumMessageOption[];
 }
 
 export interface MessageConfiguration {
@@ -90,11 +95,12 @@ export const RawMessage = (): RawMessage => ({ type: MessageTypeEnum.Raw });
 
 export const EnumMessage = (options: string[]) => ({
   type: MessageTypeEnum.Enum,
-  options,
+  options: options.map((option) => ({ protoName: option })),
 });
 
 export interface ProtoMessageField<T extends MessageConfiguration> {
   name: string;
+  friendlyName?: string;
   configuration: T;
 }
 
@@ -119,7 +125,9 @@ export const UnknownProto = (
 ): ProtoMessage => ({
   name,
   fullName,
-  values: [{ name: 'Raw JSON', configuration: RawMessage() }],
+  values: [
+    { name: 'Raw JSON', friendlyName: 'Raw JSON', configuration: RawMessage() },
+  ],
 });
 
 export const EDITABLE_MESSAGE_TYPES = [
diff --git a/src/app/proto-definition-selector/definition-editor/definition-editor-field/definition-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/definition-editor-field/definition-editor-field.component.ts
index f1b7fba..f823f9d 100644
--- a/src/app/proto-definition-selector/definition-editor/definition-editor-field/definition-editor-field.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/definition-editor-field/definition-editor-field.component.ts
@@ -1,13 +1,12 @@
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import {
+  EnumMessage,
   ListMessage,
   MapMessage,
   MessageConfiguration,
   MessageTypeEnum,
   NumericMessage,
   ObjectMessage,
-  ProtoMessageField,
   StringMessage,
 } from '../../../model/proto-message.model';
 import { FormsModule } from '@angular/forms';
@@ -18,11 +17,11 @@ import { ListEditorFieldComponent } from '../list-editor-field/list-editor-field
 import { MapEditorFieldComponent } from '../map-editor-field/map-editor-field.component';
 import { ObjectEditorFieldComponent } from '../object-editor-field/object-editor-field.component';
 import { StringEditorFieldComponent } from '../string-editor-field/string-editor-field.component';
+import { EnumEditorFieldComponent } from '../enum-editor-field/enum-editor-field.component';
 
 @Component({
   selector: 'app-definition-editor-field',
   imports: [
-    CommonModule,
     FormsModule,
     ListEditorFieldComponent,
     MapEditorFieldComponent,
@@ -31,6 +30,7 @@ import { StringEditorFieldComponent } from '../string-editor-field/string-editor
     MatSelectModule,
     ObjectEditorFieldComponent,
     StringEditorFieldComponent,
+    EnumEditorFieldComponent,
   ],
   template: ` @switch (fieldConfiguration().type) {
     @case(MessageTypeEnum.String) {
@@ -48,9 +48,11 @@ import { StringEditorFieldComponent } from '../string-editor-field/string-editor
         [(ngModel)]="configuration.min"
         [max]="configuration.max ?? null"
       />
-      <mat-hint *ngIf="min.hasError('max')"
+      @if(min.hasError('max')) {
+      <mat-hint
         >Min should not be greater than {{ configuration.max }}</mat-hint
       >
+      }
     </mat-form-field>
     <mat-form-field>
       <mat-label>Max</mat-label>
@@ -61,9 +63,9 @@ import { StringEditorFieldComponent } from '../string-editor-field/string-editor
         [(ngModel)]="configuration.max"
         [min]="configuration.min ?? null"
       />
-      <mat-hint *ngIf="max.hasError('min')"
-        >Max should not be less than {{ configuration.min }}</mat-hint
-      >
+      @if(max.hasError('min')) {
+      <mat-hint>Max should not be less than {{ configuration.min }}</mat-hint>
+      }
     </mat-form-field>
     } @case (MessageTypeEnum.List) {
     <app-list-editor-field
@@ -77,6 +79,10 @@ import { StringEditorFieldComponent } from '../string-editor-field/string-editor
     <app-object-editor-field
       [field]="objectConfiguration(fieldConfiguration())"
     ></app-object-editor-field>
+    } @case(MessageTypeEnum.Enum) {
+    <app-enum-editor-field
+      [configuration]="enumConfiguration(fieldConfiguration())"
+    ></app-enum-editor-field>
     } }`,
   styleUrl: './definition-editor-field.component.css',
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -104,5 +110,9 @@ export class DefinitionEditorFieldComponent {
     return configuration as ObjectMessage;
   }
 
+  protected enumConfiguration(configuration: MessageConfiguration) {
+    return configuration as EnumMessage;
+  }
+
   protected readonly MessageTypeEnum = MessageTypeEnum;
 }
diff --git a/src/app/proto-definition-selector/definition-editor/definition-editor.component.scss b/src/app/proto-definition-selector/definition-editor/definition-editor.component.scss
index e69de29..9ee20ad 100644
--- a/src/app/proto-definition-selector/definition-editor/definition-editor.component.scss
+++ b/src/app/proto-definition-selector/definition-editor/definition-editor.component.scss
@@ -0,0 +1,3 @@
+mat-form-field {
+  display: block;
+}
diff --git a/src/app/proto-definition-selector/definition-editor/definition-editor.component.ts b/src/app/proto-definition-selector/definition-editor/definition-editor.component.ts
index ac60ea5..485b74a 100644
--- a/src/app/proto-definition-selector/definition-editor/definition-editor.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/definition-editor.component.ts
@@ -1,9 +1,7 @@
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
 import {
-  EDITABLE_MESSAGE_TYPES,
   ListMessage,
   MessageConfiguration,
   MessageTypeEnum,
@@ -11,13 +9,18 @@ import {
   ProtoMessage,
 } from '../../model/proto-message.model';
 import { DefinitionEditorFieldComponent } from './definition-editor-field/definition-editor-field.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { FormsModule } from '@angular/forms';
+import { MatInputModule } from '@angular/material/input';
 
 @Component({
   selector: 'app-definition-editor',
   imports: [
-    CommonModule,
+    FormsModule,
     MatButtonModule,
     MatDialogModule,
+    MatFormFieldModule,
+    MatInputModule,
     DefinitionEditorFieldComponent,
   ],
   template: `
@@ -25,6 +28,14 @@ import { DefinitionEditorFieldComponent } from './definition-editor-field/defini
     <mat-dialog-content>
       @for (field of editableMessages; track $index) {
       <h3>{{ field.name }}</h3>
+      <mat-form-field>
+        <mat-label>Friendly Name</mat-label>
+        <input
+          matInput
+          [(ngModel)]="field.friendlyName"
+          placeholder="Optional"
+        />
+      </mat-form-field>
       <app-definition-editor-field
         [fieldConfiguration]="field.configuration"
       ></app-definition-editor-field>
@@ -40,26 +51,5 @@ import { DefinitionEditorFieldComponent } from './definition-editor-field/defini
 export class DefinitionEditorComponent {
   protected protoMessage = inject<ProtoMessage>(MAT_DIALOG_DATA);
 
-  protected editableMessages = this.protoMessage.values.filter((message) =>
-    this.filterMessageConfiguration(message.configuration)
-  );
-
-  private filterMessageConfiguration(
-    configuration: MessageConfiguration
-  ): boolean {
-    if (configuration.type === MessageTypeEnum.List) {
-      return this.filterMessageConfiguration(
-        (configuration as ListMessage).subConfiguration
-      );
-    }
-    if (configuration.type === MessageTypeEnum.Object) {
-      // Ensure at least one nested message can be configured
-      return !!(configuration as ObjectMessage).messageDefinition.values.find(
-        (message) => this.filterMessageConfiguration(message.configuration)
-      );
-    }
-
-    // Note: Map can always be configured, as key needs to be a string or numeric type
-    return EDITABLE_MESSAGE_TYPES.includes(configuration.type);
-  }
+  protected editableMessages = this.protoMessage.values;
 }
diff --git a/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.css b/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.css
new file mode 100644
index 0000000..9ee20ad
--- /dev/null
+++ b/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.css
@@ -0,0 +1,3 @@
+mat-form-field {
+  display: block;
+}
diff --git a/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.ts
new file mode 100644
index 0000000..1ba2218
--- /dev/null
+++ b/src/app/proto-definition-selector/definition-editor/enum-editor-field/enum-editor-field.component.ts
@@ -0,0 +1,28 @@
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+import { EnumMessage } from '../../../model/proto-message.model';
+import { MatFormFieldModule, MatLabel } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { FormsModule } from '@angular/forms';
+
+@Component({
+  selector: 'app-enum-editor-field',
+  standalone: true,
+  imports: [FormsModule, MatFormFieldModule, MatInputModule, MatLabel],
+  template: `
+    @for (option of configuration().options; track $index) {
+    <mat-form-field>
+      <mat-label>{{ option.protoName }}</mat-label>
+      <input
+        matInput
+        [(ngModel)]="option.friendlyName"
+        placeholder="Friendly Name"
+      />
+    </mat-form-field>
+    }
+  `,
+  styleUrl: './enum-editor-field.component.css',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EnumEditorFieldComponent {
+  configuration = input.required<EnumMessage>();
+}
diff --git a/src/app/proto-definition-selector/definition-editor/list-editor-field/list-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/list-editor-field/list-editor-field.component.ts
index 3298b49..9d91a67 100644
--- a/src/app/proto-definition-selector/definition-editor/list-editor-field/list-editor-field.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/list-editor-field/list-editor-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -10,7 +9,7 @@ import { ListMessage } from '../../../model/proto-message.model';
 
 @Component({
   selector: 'app-list-editor-field',
-  imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
+  imports: [forwardRef(() => DefinitionEditorFieldComponent)],
   template: `<app-definition-editor-field
     [fieldConfiguration]="field().subConfiguration"
   ></app-definition-editor-field>`,
diff --git a/src/app/proto-definition-selector/definition-editor/map-editor-field/map-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/map-editor-field/map-editor-field.component.ts
index dab526f..1634454 100644
--- a/src/app/proto-definition-selector/definition-editor/map-editor-field/map-editor-field.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/map-editor-field/map-editor-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -14,7 +13,7 @@ import {
 
 @Component({
   selector: 'app-map-editor-field',
-  imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
+  imports: [forwardRef(() => DefinitionEditorFieldComponent)],
   template: `
     <h4>Key Configuration</h4>
     <app-definition-editor-field
diff --git a/src/app/proto-definition-selector/definition-editor/object-editor-field/object-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/object-editor-field/object-editor-field.component.ts
index eb5791f..69e5b1f 100644
--- a/src/app/proto-definition-selector/definition-editor/object-editor-field/object-editor-field.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/object-editor-field/object-editor-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -6,31 +5,43 @@ import {
   forwardRef,
   input,
 } from '@angular/core';
-import {
-  EDITABLE_MESSAGE_TYPES,
-  ObjectMessage,
-} from '../../../model/proto-message.model';
+import { ObjectMessage } from '../../../model/proto-message.model';
 import { DefinitionEditorFieldComponent } from '../definition-editor-field/definition-editor-field.component';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatInputModule } from '@angular/material/input';
+import { FormsModule } from '@angular/forms';
 
 @Component({
   selector: 'app-object-editor-field',
-  imports: [CommonModule, forwardRef(() => DefinitionEditorFieldComponent)],
+  imports: [
+    FormsModule,
+    MatFormFieldModule,
+    MatInputModule,
+    forwardRef(() => DefinitionEditorFieldComponent),
+  ],
   template: `
     @for (field of editableFields(); track $index) {
     <h4>{{ field.name }}</h4>
+    <mat-form-field>
+      <mat-label>Friendly Name</mat-label>
+      <input matInput [(ngModel)]="field.friendlyName" placeholder="Optional" />
+    </mat-form-field>
     <app-definition-editor-field
       [fieldConfiguration]="field.configuration"
     ></app-definition-editor-field>
     }
   `,
+  styles: `
+  mat-form-field {
+    display: block;
+  }
+  `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ObjectEditorFieldComponent {
   field = input.required<ObjectMessage>();
 
-  protected editableFields = computed(() =>
-    this.field().messageDefinition.values.filter((field) =>
-      EDITABLE_MESSAGE_TYPES.includes(field.configuration.type)
-    )
+  protected editableFields = computed(
+    () => this.field().messageDefinition.values
   );
 }
diff --git a/src/app/proto-definition-selector/definition-editor/string-editor-field/string-editor-field.component.ts b/src/app/proto-definition-selector/definition-editor/string-editor-field/string-editor-field.component.ts
index b3b18eb..f5f8b8f 100644
--- a/src/app/proto-definition-selector/definition-editor/string-editor-field/string-editor-field.component.ts
+++ b/src/app/proto-definition-selector/definition-editor/string-editor-field/string-editor-field.component.ts
@@ -1,4 +1,3 @@
-import { CommonModule } from '@angular/common';
 import { ChangeDetectionStrategy, Component, input } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatFormFieldModule } from '@angular/material/form-field';
@@ -8,14 +7,9 @@ import { MatInputModule } from '@angular/material/input';
 
 @Component({
   selector: 'app-string-editor-field',
-  imports: [
-    CommonModule,
-    FormsModule,
-    MatFormFieldModule,
-    MatInputModule,
-    MatSelectModule,
-  ],
-  template: ` <mat-form-field>
+  imports: [FormsModule, MatFormFieldModule, MatInputModule, MatSelectModule],
+  template: `
+    <mat-form-field>
       <mat-label>Max Length</mat-label>
       <input matInput type="number" [(ngModel)]="configuration().maxLength" />
     </mat-form-field>
@@ -25,7 +19,8 @@ import { MatInputModule } from '@angular/material/input';
         <mat-option value="text">Text</mat-option>
         <mat-option value="sql">SQL</mat-option>
       </mat-select>
-    </mat-form-field>`,
+    </mat-form-field>
+  `,
   styleUrl: './string-editor-field.component.scss',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
diff --git a/src/app/proto-definition-selector/proto-definition-selector.component.ts b/src/app/proto-definition-selector/proto-definition-selector.component.ts
index b4666bd..37a7efd 100644
--- a/src/app/proto-definition-selector/proto-definition-selector.component.ts
+++ b/src/app/proto-definition-selector/proto-definition-selector.component.ts
@@ -1,16 +1,26 @@
-import { CommonModule } from '@angular/common';
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, HostBinding, HostListener, computed, output, signal, viewChild, inject } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  HostBinding,
+  HostListener,
+  computed,
+  inject,
+  output,
+  signal,
+  viewChild,
+} from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
-import { MatListModule, MatSelectionList } from '@angular/material/list';
-import { ProtoMessage } from '../model/proto-message.model';
-import { ProtoDefinitionService } from './proto-definition.service';
-import { MatTreeModule } from '@angular/material/tree';
-import { MatSnackBar } from '@angular/material/snack-bar';
-import { writeTextFile } from '@tauri-apps/api/fs';
-import { save } from '@tauri-apps/api/dialog';
-import { MatIconModule } from '@angular/material/icon';
 import { MatDialog } from '@angular/material/dialog';
+import { MatIconModule } from '@angular/material/icon';
+import { MatListModule, MatSelectionList } from '@angular/material/list';
+import { MatSnackBar } from '@angular/material/snack-bar';
+import { MatTreeModule } from '@angular/material/tree';
+import { save } from '@tauri-apps/api/dialog';
+import { writeTextFile } from '@tauri-apps/api/fs';
+import { ProtoMessage } from '../model/proto-message.model';
 import { DefinitionEditorComponent } from './definition-editor/definition-editor.component';
+import { ProtoDefinitionService } from './proto-definition.service';
 
 declare const __TAURI__: any;
 
@@ -18,13 +28,7 @@ const collator = new Intl.Collator(undefined, { numeric: true });
 
 @Component({
   selector: 'app-proto-definition-selector',
-  imports: [
-    CommonModule,
-    MatButtonModule,
-    MatIconModule,
-    MatListModule,
-    MatTreeModule,
-  ],
+  imports: [MatButtonModule, MatIconModule, MatListModule, MatTreeModule],
   template: `
     <h2>Protobuf Definitions</h2>
     <button mat-button (click)="protoSelector.click()">
@@ -66,7 +70,7 @@ const collator = new Intl.Collator(undefined, { numeric: true });
         >
           <mat-icon>edit</mat-icon>
         </button>
-        <div matListItemLine>{{ item.name }}</div>
+        <div>{{ item.name }}</div>
       </mat-list-option>
       }
     </mat-selection-list>