diff --git a/admin/src/app/foms/fom-add-edit/fom-add-edit.component.html b/admin/src/app/foms/fom-add-edit/fom-add-edit.component.html
index c182775b9..cfff5ab7e 100644
--- a/admin/src/app/foms/fom-add-edit/fom-add-edit.component.html
+++ b/admin/src/app/foms/fom-add-edit/fom-add-edit.component.html
@@ -135,7 +135,6 @@ <h1 class="text-muted">{{isCreate ? 'Add New' : 'Edit'}} FOM {{isCreate ? '' : '
               readonly
               id="op-end-year"
               name="op-end-year"
-
               class="form-control readonly-normal"
               type="text"
               placeholder="YYYY"
@@ -159,9 +158,36 @@ <h1 class="text-muted">{{isCreate ? 'Add New' : 'Edit'}} FOM {{isCreate ? '' : '
         </div>
 
         <div class="row">
-
-          <div class="form-group col-md-2">
-            <label for="fsp-id" style="white-space: nowrap;"
+          <div class="form-group col">
+            <label [ngClass]="{'required': this.isCreate}">Type of Plan Holder</label>
+            <select *ngIf="this.isCreate"
+                class="form-control"
+                formControlName="projectPlanCode"
+                (change)="onProjectPlanChange($event)"
+                [ngClass]="{'is-invalid': !fg.get('projectPlanCode').value && isSubmitSaveClicked}" 
+                id="projectPlanSelectId">
+              <option *ngFor="let option of projectPlanOptions" 
+                [value]="option.code"
+                [selected]="option.code === fg.get('projectPlanCode').value" 
+                [innerHTML]="option.description"> </option>
+            </select>
+            <input *ngIf="!this.isCreate" type="text"
+              class="form-control"
+              id="projectPlanDescId"
+              name="projectPlanDescription"
+              disabled
+              [value]="getProjectPlanDesc()"
+            />
+            <div class="invalid-feedback" 
+              *ngIf="(isSubmitSaveClicked || fieldTouchedOrDirty('projectPlanCode')) 
+              && getErrorMessage('projectPlanCode', 'required')">
+              {{getErrorMessage('projectPlanCode', 'required')}}
+            </div>
+          </div>
+          <!-- FSP ID Input -->
+          <div class="form-group col"
+            *ngIf="fg.get('projectPlanCode').value == projectPlanCodeEnum.Fsp">
+            <label for="fsp-id" [ngClass]="{'required': true}" style="white-space: nowrap;"
             >FSP ID</label>
             <input
               type="number"
@@ -172,13 +198,40 @@ <h1 class="text-muted">{{isCreate ? 'Add New' : 'Edit'}} FOM {{isCreate ? '' : '
               [appFormControl]="fg.get('fspId')"
             />
             <div class="invalid-feedback" 
-              *ngIf="(isSubmitSaveClicked || fieldTouchedOrDirty('fspId')) 
-              && getErrorMessage('fspId', 'required')">
-              {{getErrorMessage('fspId', 'required')}}
+              *ngIf="(isSubmitSaveClicked || fieldTouchedOrDirty('fspId'))">
+              <div>{{getErrorMessage('fspId', 'required')}}</div>
+              <div>{{getErrorMessage('fspId', 'numeric')}}</div>
             </div>
           </div>
+
+          <!-- Woodlot License Number Input -->
+          <div class="form-group col"
+            *ngIf="fg.get('projectPlanCode').value == projectPlanCodeEnum.Woodlot">
+            <label for="woodlot-id" [ngClass]="{'required': true}" style="white-space: nowrap;"
+            >Woodlot License Number</label>
+            <input
+              type="text"
+              class="form-control"
+              id="woodlot-id"
+              name="woodlot-id"
+              formControlName="woodlotLicenseNumber"
+              [appFormControl]="fg.get('woodlotLicenseNumber')"
+            />
+            <div class="invalid-feedback" 
+              *ngIf="(isSubmitSaveClicked || fieldTouchedOrDirty('woodlotLicenseNumber'))">
+              <div>
+                {{getErrorMessage('woodlotLicenseNumber', 'required')}}
+              </div>
+              <div>
+                {{getErrorMessage('woodlotLicenseNumber', 'woodlotFormat')}}
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
           <div class="form-group col">
-            <label for="fsp-id" style="white-space: nowrap;">District</label>
+            <label for="district-list" style="white-space: nowrap;">District</label>
             <select class="sort-comments form-control" [ngClass]="{'is-invalid': !districtIdSelect && isSubmitSaveClicked}" (change)="changeDistrictId($event)" id="district-list">
               <option *ngIf="this.isCreate || !districtIdSelect">  </option>
               <option  [value]="district.id" *ngFor="let district of districts" [selected]="district.id === districtIdSelect" [innerHTML]=" district.name "> </option>
diff --git a/admin/src/app/foms/fom-add-edit/fom-add-edit.component.ts b/admin/src/app/foms/fom-add-edit/fom-add-edit.component.ts
index 30f1cab77..6d19c0798 100644
--- a/admin/src/app/foms/fom-add-edit/fom-add-edit.component.ts
+++ b/admin/src/app/foms/fom-add-edit/fom-add-edit.component.ts
@@ -6,26 +6,29 @@ import * as moment from 'moment';
 import { Observable, Subject, of } from 'rxjs';
 import { switchMap, takeUntil, tap } from 'rxjs/operators';
 
-import { MAX_FILEUPLOAD_SIZE } from '@admin-core/utils/constants/constantUtils';
-import { DatePipe, NgClass, NgFor, NgIf } from '@angular/common';
-import {
-    AttachmentResponse, DistrictResponse, ForestClientResponse,
-    ForestClientService,
-    ProjectCreateRequest, ProjectResponse,
-    ProjectService, WorkflowStateEnum
-} from '@api-client';
-import { RxFormBuilder, RxFormGroup } from '@rxweb/reactive-form-validators';
-import { User } from "@utility/security/user";
 import { AttachmentTypeEnum } from "@admin-core/models/attachmentTypeEnum";
 import { AttachmentResolverSvc } from "@admin-core/services/AttachmentResolverSvc";
 import { CognitoService } from "@admin-core/services/cognito.service";
 import { ModalService } from '@admin-core/services/modal.service';
 import { StateService } from '@admin-core/services/state.service';
 import { AttachmentUploadService } from "@admin-core/utils/attachmentUploadService";
+import { MAX_FILEUPLOAD_SIZE } from '@admin-core/utils/constants/constantUtils';
+import { DatePipe, NgClass, NgFor, NgIf } from '@angular/common';
+import {
+  AttachmentResponse, DistrictResponse, ForestClientResponse,
+  ForestClientService,
+  ProjectCreateRequest,
+  ProjectPlanCodeEnum,
+  ProjectResponse,
+  ProjectService, WorkflowStateEnum
+} from '@api-client';
+import { RxFormBuilder, RxFormGroup } from '@rxweb/reactive-form-validators';
+import { User } from "@utility/security/user";
 import { FomAddEditForm } from './fom-add-edit.form';
 
 import { UploadBoxComponent } from '@admin-core/components/file-upload-box/file-upload-box.component';
 import { AppFormControlDirective } from '@admin-core/directives/form-control.directive';
+import { ICodeTable } from '@admin-core/models/code-tables';
 import { NewlinesPipe } from '@admin-core/pipes/newlines.pipe';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BsDatepickerConfig, BsDatepickerModule } from 'ngx-bootstrap/datepicker';
@@ -51,10 +54,15 @@ type ApplicationPageType = 'create' | 'edit';
     providers: [DatePipe]
 })
 export class FomAddEditComponent implements OnInit, AfterViewInit, OnDestroy {
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
   fg: RxFormGroup;
   state: ApplicationPageType;
   originalProjectResponse: ProjectResponse;
   districts: DistrictResponse[] = this.stateSvc.getCodeTable('district');
+  projectPlanOptions: ICodeTable[] = [
+    {"code": this.projectPlanCodeEnum.Fsp, "description": "Forest Stewardship Plan"},
+    {"code": this.projectPlanCodeEnum.Woodlot, "description": "Woodlot License Plan"}
+  ];
   forestClients: ForestClientResponse[] = [];
   public supportingDocuments: any[] = [];
   public initialPublicDocument: any[] = [];
@@ -89,7 +97,7 @@ export class FomAddEditComponent implements OnInit, AfterViewInit, OnDestroy {
   private scrollToFragment: string = null;
   private snackBarRef: MatSnackBarRef<SimpleSnackBar> = null;
   private ngUnsubscribe: Subject<void> = new Subject<void>();
-
+  
   // bsDatepicker config object
   readonly bsConfig = {
     dateInputFormat: 'YYYY', 
@@ -179,7 +187,6 @@ export class FomAddEditComponent implements OnInit, AfterViewInit, OnDestroy {
       const form = new FomAddEditForm(data);
       this.fg = <RxFormGroup>this.formBuilder.formGroup(form);
       this.initializeFormFields(this.fg, this.user, this.originalProjectResponse);
-
       if(data.description) {
         this.descriptionValue = data.description;
       }
@@ -318,6 +325,11 @@ export class FomAddEditComponent implements OnInit, AfterViewInit, OnDestroy {
     this.districtIdSelect = parseInt(e.target.value);
   }
 
+  onProjectPlanChange(e) {
+    // reset fspId and woodlotLicenseNumber fields when plan selection changed.
+    this.fg.get('fspId').setValue(null)
+    this.fg.get('woodlotLicenseNumber').setValue(null)
+  }
   onForestClientChange(e) {
     const forestClientField = this.fg.get('forestClient');
     this.fg.get('forestClient').setValue(forestClientField.value);
@@ -418,6 +430,13 @@ export class FomAddEditComponent implements OnInit, AfterViewInit, OnDestroy {
     return this.attachmentResolverSvc.isDeleteAttachmentAllowed(attachment.attachmentType.code, this.originalProjectResponse.workflowState.code);
   }
 
+  getProjectPlanDesc() {
+    const item = this.projectPlanOptions.filter((item) => {
+        return item.code == this.originalProjectResponse.projectPlanCode
+    })[0]["description"];
+    return item;
+  }
+
   /**
    * Additional setup for form control.
    */
diff --git a/admin/src/app/foms/fom-add-edit/fom-add-edit.form.ts b/admin/src/app/foms/fom-add-edit/fom-add-edit.form.ts
index 3af7198d2..64d4c54f2 100644
--- a/admin/src/app/foms/fom-add-edit/fom-add-edit.form.ts
+++ b/admin/src/app/foms/fom-add-edit/fom-add-edit.form.ts
@@ -1,6 +1,6 @@
 import { AbstractControl } from '@angular/forms';
-import { DistrictResponse, ForestClientResponse, ProjectResponse, WorkflowStateCode } from '@api-client';
-import { maxLength, minDate, minLength, prop, required } from '@rxweb/reactive-form-validators';
+import { DistrictResponse, ForestClientResponse, ProjectPlanCodeEnum, ProjectResponse, WorkflowStateCode } from '@api-client';
+import { alphaNumeric, maxLength, minDate, minLength, numeric, pattern, prop, required } from '@rxweb/reactive-form-validators';
 import * as R from 'remeda';
 import moment = require("moment");
 
@@ -9,7 +9,9 @@ const updateFields = [
   'description',
   'commentingOpenDate',
   'commentingClosedDate',
+  'projectPlanCode',
   'fspId',
+  'woodlotLicenseNumber',
   'district',
   'forestClient',
   'workflowState',
@@ -35,9 +37,33 @@ export class FomAddEditForm implements Pick<ProjectResponse,
   commentingClosedDate: string = null; 
 
   @prop()
-  @required({message: 'FSP ID is required.'})
+  @required({message: 'Type of Plan Holder is required.'})
+  projectPlanCode: string = ProjectPlanCodeEnum.Fsp
+
+  @prop()
+  @required({
+    message: 'FSP ID is required.',
+		conditionalExpression: (x) => {
+			return x.projectPlanCode == ProjectPlanCodeEnum.Fsp
+		}
+	})
   @minLength({value: 1})
-  fspId: number;
+  @numeric({message: 'Must be a number.'})
+  fspId?: number = null;
+
+  @prop()
+  @required({
+    message: 'Woodlot License Plan Number is required.',
+		conditionalExpression: (x) => {
+			return x.projectPlanCode == ProjectPlanCodeEnum.Woodlot
+		}
+	})
+  @alphaNumeric({message: 'Only alpha-numberic characters are allowed.'})
+  @pattern({
+    expression:{'woodlotFormat': /^W\d{4}$/},
+    message: 'Must starts with "W" followed by 4 digits.'
+  })
+  woodlotLicenseNumber?: string = null;
 
   @prop()
   @required({message: 'District is required.'})
diff --git a/admin/src/app/foms/fom-detail/fom-detail.component.html b/admin/src/app/foms/fom-detail/fom-detail.component.html
index 93709ff09..fd6a62f33 100644
--- a/admin/src/app/foms/fom-detail/fom-detail.component.html
+++ b/admin/src/app/foms/fom-detail/fom-detail.component.html
@@ -89,13 +89,21 @@ <h2>Description</h2>
                 <section>
                   <h2>Details</h2>
                   <ul class="nv-list">
-                    <li>
+                    <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Fsp">
                       <span class="name">FSP ID:</span>
                       <span
                         class="value">
-                        {{project.fspId}}
+                        {{project?.fspId}}
+                      </span>
+                    </li>
+                    <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Woodlot">
+                      <span class="name">Woodlot License Number:</span>
+                      <span
+                        class="value">
+                        {{project?.woodlotLicenseNumber}}
                       </span>
                     </li>
+
                     <li>
                       <span class="name">FOM Holder:</span>
                       <span
diff --git a/admin/src/app/foms/fom-detail/fom-detail.component.ts b/admin/src/app/foms/fom-detail/fom-detail.component.ts
index e045cc159..c378f1c2e 100644
--- a/admin/src/app/foms/fom-detail/fom-detail.component.ts
+++ b/admin/src/app/foms/fom-detail/fom-detail.component.ts
@@ -1,15 +1,15 @@
 import { AttachmentResolverSvc } from "@admin-core/services/AttachmentResolverSvc";
+import { CognitoService } from "@admin-core/services/cognito.service";
 import { ModalService } from '@admin-core/services/modal.service';
 import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
-import { AttachmentResponse, ProjectMetricsResponse, ProjectResponse, ProjectService, ProjectWorkflowStateChangeRequest, SpatialFeaturePublicResponse, WorkflowStateEnum } from "@api-client";
+import { AttachmentResponse, ProjectMetricsResponse, ProjectPlanCodeEnum, ProjectResponse, ProjectService, ProjectWorkflowStateChangeRequest, SpatialFeaturePublicResponse, WorkflowStateEnum } from "@api-client";
 import { NgbModal, NgbModalRef, NgbModule, NgbNav } from '@ng-bootstrap/ng-bootstrap';
 import { User } from "@utility/security/user";
 import { FeatureSelectService } from '@utility/services/featureSelect.service';
 import * as moment from 'moment';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { CognitoService } from "@admin-core/services/cognito.service";
 import { EnddateChangeModalComponent } from './enddate-change-modal/enddate-change-modal.component';
 
 import { NewlinesPipe } from "@admin-core/pipes/newlines.pipe";
@@ -37,7 +37,7 @@ import { ShapeInfoComponent } from "../shape-info/shape-info.component";
     styleUrls: ['./fom-detail.component.scss']
 })
 export class FomDetailComponent implements OnInit, OnDestroy {
-
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
   @ViewChild('scrollContainer')
   public scrollContainer: ElementRef;
   
diff --git a/admin/src/app/foms/summary/summary.component.html b/admin/src/app/foms/summary/summary.component.html
index b9ae3463d..550b730a0 100644
--- a/admin/src/app/foms/summary/summary.component.html
+++ b/admin/src/app/foms/summary/summary.component.html
@@ -42,12 +42,19 @@ <h4>Description</h4>
           <div>
             <h4>Details</h4>
             <ul class="nv-list">
-              <li>
+              <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Fsp">
                 <span class="name">FSP ID:</span>
                 <span class="value">
                   {{project?.fspId}}
                 </span>
               </li>
+              <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Woodlot">
+                <span class="name">Woodlot License Number:</span>
+                <span class="value">
+                  {{project?.woodlotLicenseNumber}}
+                </span>
+              </li>
+
               <li>
                 <span class="name">FOM Holder:</span>
                 <span class="value">
diff --git a/admin/src/app/foms/summary/summary.component.ts b/admin/src/app/foms/summary/summary.component.ts
index dbf358dba..a287fcdcb 100644
--- a/admin/src/app/foms/summary/summary.component.ts
+++ b/admin/src/app/foms/summary/summary.component.ts
@@ -1,3 +1,4 @@
+import { AttachmentResolverSvc } from '@admin-core/services/AttachmentResolverSvc';
 import { CommonUtil } from '@admin-core/utils/commonUtil';
 import { COMMENT_SCOPE_CODE, CommentScopeOpt } from '@admin-core/utils/constants/constantUtils';
 import { DatePipe, NgFor, NgIf, TitleCasePipe } from '@angular/common';
@@ -8,9 +9,10 @@ import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatSelectModule } from '@angular/material/select';
 import { ActivatedRoute, RouterLink } from '@angular/router';
 import {
-    AttachmentResponse, AttachmentService, InteractionResponse, InteractionService,
-    ProjectResponse, ProjectService, PublicCommentAdminResponse, PublicCommentService,
-    SpatialFeaturePublicResponse, SpatialFeatureService
+  AttachmentResponse, AttachmentService, InteractionResponse, InteractionService,
+  ProjectPlanCodeEnum,
+  ProjectResponse, ProjectService, PublicCommentAdminResponse, PublicCommentService,
+  SpatialFeaturePublicResponse, SpatialFeatureService
 } from '@api-client';
 import { ConfigService } from '@utility/services/config.service';
 import * as _ from 'lodash';
@@ -20,7 +22,6 @@ import { DetailsMapComponent } from '../details-map/details-map.component';
 import { ShapeInfoComponent } from '../shape-info/shape-info.component';
 import { CommentsSummaryComponent } from './comments-summary/comments-summary.component';
 import { InteractionsSummaryComponent } from './interactions-summary/interactions-summary.component';
-import { AttachmentResolverSvc } from '@admin-core/services/AttachmentResolverSvc';
 
 @Component({
     standalone: true,
@@ -44,7 +45,7 @@ import { AttachmentResolverSvc } from '@admin-core/services/AttachmentResolverSv
     styleUrls: ['./summary.component.scss']
 })
 export class SummaryComponent implements OnInit, OnDestroy {
-
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
   projectId: number;
   project: ProjectResponse;
   projectReqError: boolean;
diff --git a/admin/src/app/search/search.component.html b/admin/src/app/search/search.component.html
index e47122591..f95ad56b4 100644
--- a/admin/src/app/search/search.component.html
+++ b/admin/src/app/search/search.component.html
@@ -112,11 +112,11 @@ <h2 *ngIf="!searching && count > 0">
           <tr>
             <th id="fomId" class="disp">FOM Number</th>
             <th id="fomName" class="client">FOM Name</th>
-            <th id="fspId" class="disp">FSP ID</th>
+            <th id="projectPlanNumber" class="plan">Plan Number</th>
             <th id="fomHolder" class="client">FOM Holder Name</th>
-            <th id="district" class="client">District</th>
+            <th id="district">District</th>
             <th id="fomStatus" class="status">FOM Status</th>
-            <th id="commentClosed" class="client">Commenting Closed Date</th>
+            <th id="commentClosed">Commenting Closed Date</th>
             <th id="actions" class="actions"></th>
           </tr>
           </thead>
@@ -129,7 +129,7 @@ <h2 *ngIf="!searching && count > 0">
                 [innerHTML]="project.name ? project.name : '<em>No FOM name on this File</em>'">
               </td>
               <td>
-                {{project.fspId}}
+                {{getProjectPlanNumber(project)}}
               </td>
               <td
                 [innerHTML]="project.forestClient ? (project.forestClient.name | titlecase) : ''">
diff --git a/admin/src/app/search/search.component.scss b/admin/src/app/search/search.component.scss
index 7055a6c7d..1c250c95f 100644
--- a/admin/src/app/search/search.component.scss
+++ b/admin/src/app/search/search.component.scss
@@ -170,10 +170,11 @@ $sr-table-row-bg: #f7f8fa;
 
 .disp {
   min-width: 5rem;
+  text-align: center;
 }
 
-.status {
-  width: 11rem;
+.status, .plan {
+  width: 7rem;
 }
 
 .actions {
@@ -181,7 +182,6 @@ $sr-table-row-bg: #f7f8fa;
   text-align: right;
   padding-top: 0;
   padding-bottom: 0;
-
   .btn {
     width: 6rem;
     border-width: 2px;
@@ -189,8 +189,20 @@ $sr-table-row-bg: #f7f8fa;
   }
 }
 
-.app-details {
-  border-top: 4px solid #fff;
+table {
+  th,td,strong {
+    padding-left: 0;
+  }
+
+  .app-details {
+    border-top: 4px solid #fff;
+  }
+}
+
+// A very light background-color seems to be coming from <table> on some of the columns. 
+// Remove the background-color.
+.table>:not(caption)>*>* {
+    background-color: transparent;
 }
 
 .app-comment-details {
diff --git a/admin/src/app/search/search.component.ts b/admin/src/app/search/search.component.ts
index a4c6ef5c3..7e68bff9b 100644
--- a/admin/src/app/search/search.component.ts
+++ b/admin/src/app/search/search.component.ts
@@ -6,7 +6,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { MatSnackBar, MatSnackBarRef, SimpleSnackBar } from '@angular/material/snack-bar';
 import { ActivatedRoute, ParamMap, Params, Router, RouterLink } from '@angular/router';
-import { ProjectResponse, ProjectService, WorkflowStateEnum } from "@api-client";
+import { ProjectPlanCodeEnum, ProjectResponse, ProjectService, WorkflowStateEnum } from "@api-client";
 import { NgbDropdown, NgbDropdownMenu, NgbDropdownToggle } from '@ng-bootstrap/ng-bootstrap';
 import { RxReactiveFormsModule } from '@rxweb/reactive-form-validators';
 import { User } from "@utility/security/user";
@@ -33,6 +33,7 @@ import { takeUntil } from 'rxjs/operators';
     styleUrls: ['./search.component.scss']
 })
 export class SearchComponent implements OnInit, OnDestroy {
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
   private ngUnsubscribe = new Subject<void>();
   private paramMap: ParamMap = null;
   private snackBarRef: MatSnackBarRef<SimpleSnackBar> = null;
@@ -175,6 +176,13 @@ export class SearchComponent implements OnInit, OnDestroy {
       || project.workflowState.code === WorkflowStateEnum.CommentClosed);
   }
 
+  public getProjectPlanNumber(project) {
+    // There are only two projectPlanCode for now.
+    return project.projectPlanCode == this.projectPlanCodeEnum.Fsp? 
+      "FSP #" + project.fspId : 
+      "WL #" + project.woodlotLicenseNumber
+  }
+
   ngOnDestroy() {
     if (this.snackBarRef) {
       this.snackBarRef.dismiss();
diff --git a/admin/src/core/models/code-tables.ts b/admin/src/core/models/code-tables.ts
index a6bf7c2c3..a676917b0 100644
--- a/admin/src/core/models/code-tables.ts
+++ b/admin/src/core/models/code-tables.ts
@@ -6,3 +6,8 @@ export interface CodeTables {
   workflowResponseCode: WorkflowStateCode[],
   commentScopeCode: CommentScopeCode[]
 }
+
+export interface ICodeTable { 
+    code: string;
+    description: string;
+}
\ No newline at end of file
diff --git a/api/openapi/swagger-spec.json b/api/openapi/swagger-spec.json
index dfbbbba2d..f6cb12392 100644
--- a/api/openapi/swagger-spec.json
+++ b/api/openapi/swagger-spec.json
@@ -1735,9 +1735,15 @@
               "type": "object",
               "example": " { \"type\": \"Point\", \"coordinates\": [-119.396071939, 49.813816629]}"
             },
+            "projectPlanCode": {
+              "type": "string"
+            },
             "fspId": {
               "type": "number"
             },
+            "woodlotLicenseNumber": {
+              "type": "string"
+            },
             "forestClientName": {
               "type": "string"
             },
@@ -1749,7 +1755,7 @@
             "id",
             "name",
             "geojson",
-            "fspId",
+            "projectPlanCode",
             "forestClientName",
             "workflowStateName"
           ]
@@ -1823,9 +1829,15 @@
               "type": "string",
               "description": "ISO-formatted date"
             },
+            "projectPlanCode": {
+              "type": "string"
+            },
             "fspId": {
               "type": "number"
             },
+            "woodlotLicenseNumber": {
+              "type": "string"
+            },
             "district": {
               "$ref": "#/components/schemas/DistrictResponse"
             },
@@ -1869,7 +1881,7 @@
             "commentingOpenDate",
             "commentingClosedDate",
             "validityEndDate",
-            "fspId",
+            "projectPlanCode",
             "district",
             "forestClient",
             "workflowState",
@@ -1906,6 +1918,13 @@
             "respondedToCommentsCount"
           ]
         },
+        "ProjectPlanCodeEnum": {
+          "type": "string",
+          "enum": [
+            "FSP",
+            "WOODLOT"
+          ]
+        },
         "ProjectCreateRequest": {
           "type": "object",
           "properties": {
@@ -1926,9 +1945,15 @@
             "forestClientNumber": {
               "type": "string"
             },
+            "projectPlanCode": {
+              "$ref": "#/components/schemas/ProjectPlanCodeEnum"
+            },
             "fspId": {
               "type": "number"
             },
+            "woodlotLicenseNumber": {
+              "type": "string"
+            },
             "districtId": {
               "type": "number"
             },
@@ -1948,7 +1973,9 @@
             "commentingOpenDate",
             "commentingClosedDate",
             "forestClientNumber",
+            "projectPlanCode",
             "fspId",
+            "woodlotLicenseNumber",
             "districtId",
             "operationStartYear",
             "operationEndYear",
@@ -1972,9 +1999,15 @@
               "type": "string",
               "description": "ISO-formatted date"
             },
+            "projectPlanCode": {
+              "$ref": "#/components/schemas/ProjectPlanCodeEnum"
+            },
             "fspId": {
               "type": "number"
             },
+            "woodlotLicenseNumber": {
+              "type": "string"
+            },
             "districtId": {
               "type": "number"
             },
diff --git a/api/src/app/modules/project/project-plan-code.entity.ts b/api/src/app/modules/project/project-plan-code.entity.ts
new file mode 100644
index 000000000..8400f8af5
--- /dev/null
+++ b/api/src/app/modules/project/project-plan-code.entity.ts
@@ -0,0 +1,14 @@
+import { ApiCodeTableEntity } from '@entities';
+import { Entity } from 'typeorm';
+
+@Entity('project_plan_code', {schema: 'app_fom'})
+export class ProjectPlanCode extends ApiCodeTableEntity<ProjectPlanCode> {
+  constructor(projectPlanCode?: Partial<ProjectPlanCode>) {
+    super(projectPlanCode);
+  }
+}
+
+export enum ProjectPlanCodeEnum {
+  FSP = 'FSP',
+  WOODLOT = 'WOODLOT'
+}
diff --git a/api/src/app/modules/project/project.dto.ts b/api/src/app/modules/project/project.dto.ts
index c9587444a..ea51a50e9 100644
--- a/api/src/app/modules/project/project.dto.ts
+++ b/api/src/app/modules/project/project.dto.ts
@@ -1,13 +1,22 @@
-import { ApiProperty, OmitType, PartialType } from '@nestjs/swagger';
 import { DateTimeUtil } from '@api-core/dateTimeUtil';
-import { WorkflowStateCode, WorkflowStateEnum } from './workflow-state-code.entity';
+import { ApiProperty, ApiPropertyOptional, OmitType, PartialType } from '@nestjs/swagger';
+import { ProjectPlanCodeEnum } from '@src/app/modules/project/project-plan-code.entity';
+import {
+    IsAlphanumeric,
+    IsBoolean, IsDateString, IsEnum, IsNumber, IsNumberString, IsOptional, Matches, MaxLength,
+    Min,
+    MinLength,
+    registerDecorator,
+    ValidateIf,
+    ValidationArguments, ValidationOptions
+} from 'class-validator';
 import { Point } from 'geojson';
 import { DistrictResponse } from '../district/district.dto';
 import { ForestClientResponse } from '../forest-client/forest-client.dto';
-import { IsBoolean, IsDateString, IsEnum, IsNumber, IsNumberString, IsOptional, MaxLength, 
-  MinLength, Min, registerDecorator, ValidationArguments, ValidationOptions, IsNotEmpty, ValidateIf } from 'class-validator';
+import { WorkflowStateCode, WorkflowStateEnum } from './workflow-state-code.entity';
 
 export class ProjectCreateRequest {
+
   @ApiProperty()
   @MaxLength(50) 
   @MinLength(5) 
@@ -32,9 +41,26 @@ export class ProjectCreateRequest {
   @IsNumberString()
   forestClientNumber: string;
 
+  @ApiProperty({ 
+    required: true, 
+    enum: ProjectPlanCodeEnum, 
+    enumName: 'ProjectPlanCodeEnum'
+  })
+  @IsEnum(ProjectPlanCodeEnum)
+  projectPlanCode: ProjectPlanCodeEnum
+
   @ApiProperty()
+  @ValidateIf(o => o.projectPlan as ProjectPlanCodeEnum === ProjectPlanCodeEnum.FSP) // validate when projectPlan is FSP
   @IsNumber()
-  fspId: number;
+  fspId?: number;
+
+  @ApiProperty()
+  @ValidateIf(o => o.projectPlan as ProjectPlanCodeEnum === ProjectPlanCodeEnum.WOODLOT) // validate when projectPlan is WOODLOT
+  @MinLength(5)
+  @MaxLength(5)
+  @IsAlphanumeric()
+  @Matches(/^W\d{4}/) // woodlot number regular expression. (W followed by 4 numbers).
+  woodlotLicenseNumber?: string;
 
   @ApiProperty()
   @IsNumber()
@@ -90,8 +116,14 @@ export class ProjectPublicSummaryResponse {
   geojson: FomPoint;
 
   @ApiProperty()
+  projectPlanCode: string
+  
+  @ApiPropertyOptional()
   fspId: number;
 
+  @ApiPropertyOptional()
+  woodlotLicenseNumber?: string;
+
   @ApiProperty()
   forestClientName: string;
 
@@ -121,7 +153,13 @@ export class ProjectResponse {
   validityEndDate: string
 
   @ApiProperty()
-  fspId: number;
+  projectPlanCode: string
+
+  @ApiPropertyOptional()
+  fspId?: number;
+
+  @ApiPropertyOptional()
+  woodlotLicenseNumber?: string;
 
   @ApiProperty()
   district: DistrictResponse;
diff --git a/api/src/app/modules/project/project.entity.ts b/api/src/app/modules/project/project.entity.ts
index 57b1ba350..b742da634 100644
--- a/api/src/app/modules/project/project.entity.ts
+++ b/api/src/app/modules/project/project.entity.ts
@@ -1,4 +1,5 @@
 import { ApiBaseEntity } from '@entities';
+import { ProjectPlanCode } from '@src/app/modules/project/project-plan-code.entity';
 import { Column, Entity, JoinColumn, ManyToOne, OneToMany, PrimaryGeneratedColumn, RelationId } from 'typeorm';
 import { District } from '../district/district.entity';
 import { ForestClient } from '../forest-client/forest-client.entity';
@@ -34,6 +35,9 @@ export class Project extends ApiBaseEntity<Project> {
   @Column({ name: 'fsp_id'})
   fspId: number;
 
+  @Column({ name: 'woodlot_license_number'})
+  woodlotLicenseNumber: string;
+
   @ManyToOne(() => District)
   @JoinColumn({ name: 'district_id', referencedColumnName: 'id' })
   district: District;
@@ -58,6 +62,14 @@ export class Project extends ApiBaseEntity<Project> {
   @RelationId((project: Project) => project.workflowState)
   workflowStateCode: string;
 
+  @ManyToOne(() => ProjectPlanCode)
+  @JoinColumn({ name: 'project_plan_code', referencedColumnName: 'code' })
+  projectPlan: ProjectPlanCode;
+
+  @Column({ name: 'project_plan_code'})
+  @RelationId((project: Project) => project.projectPlan)
+  projectPlanCode: string;
+
   @OneToMany(type => Submission, (submission) => submission.project) 
   submissions: Submission[];
   
diff --git a/api/src/app/modules/project/project.module.ts b/api/src/app/modules/project/project.module.ts
index bd1bd6f71..20bba1cb7 100644
--- a/api/src/app/modules/project/project.module.ts
+++ b/api/src/app/modules/project/project.module.ts
@@ -1,28 +1,29 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
 
+import { ProjectController } from './project.controller';
 import { Project } from './project.entity';
 import { ProjectService } from './project.service';
-import { ProjectController } from './project.controller';
 
 import { PublicNotice } from './public-notice.entity';
 
+import { MailModule } from '@api-core/mail/mail.module';
+import { SecurityModule } from '@api-core/security/security.module';
+import { AttachmentModule } from '@api-modules/attachment/attachment.module';
+import { ProjectPlanCode } from '@src/app/modules/project/project-plan-code.entity';
 import { DistrictModule } from '../district/district.module';
 import { ForestClientModule } from '../forest-client/forest-client.module';
-import { SecurityModule } from '@api-core/security/security.module';
-import { WorkflowStateCodeController } from './workflow-state-code.controller';
-import { WorkflowStateCodeService } from './workflow-state-code.service';
-import { WorkflowStateCode } from './workflow-state-code.entity';
+import { PublicCommentModule } from '../public-comment/public-comment.module';
 import { ProjectAuthService } from './project-auth.service';
-import { PublicNoticeService } from './public-notice.service';
 import { PublicNoticeController } from './public-notice.controller';
-import { AttachmentModule } from '@api-modules/attachment/attachment.module';
-import { PublicCommentModule } from '../public-comment/public-comment.module';
-import { MailModule } from '@api-core/mail/mail.module';
+import { PublicNoticeService } from './public-notice.service';
+import { WorkflowStateCodeController } from './workflow-state-code.controller';
+import { WorkflowStateCode } from './workflow-state-code.entity';
+import { WorkflowStateCodeService } from './workflow-state-code.service';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([Project, WorkflowStateCode, PublicNotice]),
+    TypeOrmModule.forFeature([Project, WorkflowStateCode, PublicNotice, ProjectPlanCode]),
     DistrictModule,
     ForestClientModule,
     SecurityModule,
diff --git a/api/src/app/modules/project/project.service.ts b/api/src/app/modules/project/project.service.ts
index 2623c94e3..c86af0c73 100644
--- a/api/src/app/modules/project/project.service.ts
+++ b/api/src/app/modules/project/project.service.ts
@@ -14,9 +14,10 @@ import { BadRequestException, ForbiddenException, Injectable, InternalServerErro
 import { Cron } from '@nestjs/schedule';
 import { InjectRepository } from '@nestjs/typeorm';
 import { USER_SYSTEM } from '@src/app-constants';
+import { ProjectPlanCodeEnum } from '@src/app/modules/project/project-plan-code.entity';
 import { User } from "@utility/security/user";
 import * as dayjs from 'dayjs';
-import { isNil } from 'lodash';
+import { isEmpty, isNil } from 'lodash';
 import { PinoLogger } from 'nestjs-pino';
 import { Repository, SelectQueryBuilder } from 'typeorm';
 import {
@@ -174,6 +175,7 @@ export class ProjectService extends DataService<Project, Repository<Project>, Pr
   async create(request: any, user: User): Promise<ProjectResponse> {
     request.workflowStateCode = WorkflowStateEnum.INITIAL;
     request.forestClientId = request.forestClientNumber;
+    this.validateProjectPlan(request.projectPlanCode, request.fspId, request.woodlotLicenseNumber);
     await this.validateTimberSalesManager(request.bctsMgrName, request.forestClientNumber, null);
     return super.create(request, user);
   }
@@ -204,6 +206,22 @@ export class ProjectService extends DataService<Project, Repository<Project>, Pr
     }
   }
 
+  validateProjectPlan(projectPlanCode: ProjectPlanCodeEnum, fspId: number, woodlotLicenseNumber: string) {
+    if (isNil(projectPlanCode)) {
+        throw new BadRequestException("FOM type of plan holder is required.");
+    }
+    if (projectPlanCode == ProjectPlanCodeEnum.FSP) {
+        if (!isNil(woodlotLicenseNumber) || !isEmpty(woodlotLicenseNumber)) {
+            throw new BadRequestException("Contains invalid input for Forest Stewardship Plan FOM. Woodlot license number should be empty.");
+        }
+    }
+    else if (projectPlanCode == ProjectPlanCodeEnum.WOODLOT) {
+        if (!isNil(fspId)) {
+            throw new BadRequestException("Contains invalid input for Woodlot License Plan FOM. FSP ID should be empty.");
+        }
+    }
+  }
+
   async find(findCriteria: ProjectFindCriteria):Promise<ProjectResponse[]> {
     this.logger.debug('Find criteria: %o', findCriteria);
 
@@ -271,6 +289,9 @@ export class ProjectService extends DataService<Project, Repository<Project>, Pr
     response.operationStartYear = entity.operationStartYear;
     response.operationEndYear = entity.operationEndYear;
     response.bctsMgrName = entity.bctsMgrName;
+    response.projectPlanCode = entity.projectPlanCode
+    response.woodlotLicenseNumber = entity.woodlotLicenseNumber
+
     return response;
   }
 
@@ -319,7 +340,10 @@ export class ProjectService extends DataService<Project, Repository<Project>, Pr
     // Use reduced select to optimize performance. 
     this.logger.info('findPublicSummaries - Querying database with criteria %o', findCriteria.getCacheKey());
     const query = this.repository.createQueryBuilder("p")
-      .select(['p.id', 'p.geojson', 'p.fspId', 'p.name', 'forestClient.name', 'workflowState.description']) 
+      .select([
+        'p.id', 'p.geojson', 'p.fspId', 'p.name', 'forestClient.name', 'workflowState.description',
+        'p.projectPlanCode', 'p.woodlotLicenseNumber'
+      ]) 
       .leftJoin('p.forestClient', 'forestClient')
       .leftJoin("p.workflowState", "workflowState")
       ;
@@ -496,14 +520,21 @@ export class ProjectService extends DataService<Project, Repository<Project>, Pr
    * @param stateTransition WorkflowStateEnum transition to
    */
   async validateWorkflowTransitionRules(entity: Project, stateTransition: WorkflowStateEnum, user: User) {
+    const projectPlanCode = entity.projectPlanCode;
     const fspId = entity.fspId;
+    const woodlotLicenseNumber = entity.woodlotLicenseNumber;
     const districtId = entity.districtId;
 
-    if (isNil(fspId) || isNaN(fspId)) {
+    if (projectPlanCode == ProjectPlanCodeEnum.FSP && (isNil(fspId) || isNaN(fspId))) {
       throw new BadRequestException(`Unable to transition FOM ${entity.id} to ${stateTransition}. 
             Missing FSP ID.`);
     }
 
+    if (projectPlanCode == ProjectPlanCodeEnum.WOODLOT && (isNil(woodlotLicenseNumber) || isEmpty(woodlotLicenseNumber))) {
+        throw new BadRequestException(`Unable to transition FOM ${entity.id} to ${stateTransition}. 
+              Missing Woodlot License Number.`);
+      }
+
     if (!await this.isDistrictExist(districtId)) {
       throw new BadRequestException(`Unable to transition FOM ${entity.id} to ${stateTransition}.  
             Missing District.`);
diff --git a/api/src/app/modules/project/public-notice.service.spec.ts b/api/src/app/modules/project/public-notice.service.spec.ts
index 94e46fcf8..59d449a6e 100644
--- a/api/src/app/modules/project/public-notice.service.spec.ts
+++ b/api/src/app/modules/project/public-notice.service.spec.ts
@@ -271,7 +271,7 @@ function getSimplePublicNoticeCreateRequestData() {
   return data;
 }
 
-function getSimpleProjectResponseData() {
+function getSimpleProjectResponseData(): ProjectResponse {
   const data =  
   {
     "id": 1,
@@ -280,6 +280,7 @@ function getSimpleProjectResponseData() {
     "commentingOpenDate": "2022-08-01",
     "commentingClosedDate": "2027-07-29",
     "validityEndDate": "2052-12-31",
+    "projectPlanCode": "FSP",
     "fspId": 10,
     "district": {
       "id": 21,
diff --git a/api/src/migrations/main/1721691825980-project-plan-table.js b/api/src/migrations/main/1721691825980-project-plan-table.js
new file mode 100644
index 000000000..de9737964
--- /dev/null
+++ b/api/src/migrations/main/1721691825980-project-plan-table.js
@@ -0,0 +1,79 @@
+const { MigrationInterface, QueryRunner } = require("typeorm");
+
+module.exports = class ProjectPlanTable1721691825980 {
+
+    async up(queryRunner) {
+        console.log('Starting new project_plan_code migration.');
+        await queryRunner.query(`
+        -- add new table - project_plan_code
+            drop table if exists app_fom.project_plan_code;  
+            create table if not exists app_fom.project_plan_code  
+            ( 
+                code varchar(15) not null primary key,
+                description varchar not null,  
+                revision_count integer not null default 1,
+                create_timestamp timestamptz not null default now(),  
+                create_user varchar not null,  
+                update_timestamp timestamptz,  
+                update_user varchar  
+            );
+
+        -- comments on columns.
+            comment on table  app_fom.project_plan_code is 'Categories to classify FOM submission from different licensee plan';
+            comment on column app_fom.project_plan_code.code is 'Code value';
+            comment on column app_fom.project_plan_code.description is 'Code description';
+            comment on column app_fom.project_plan_code.create_timestamp is 'Time of creation of the record.';
+            comment on column app_fom.project_plan_code.create_user is 'The user id who created the record.';
+            comment on column app_fom.project_plan_code.update_timestamp is 'Time of most recent update to the record.';
+            comment on column app_fom.project_plan_code.update_user is 'The user id who last updated the record.';
+            comment on column app_fom.project_plan_code.revision_count is 'Standard column for optimistic locking on updates.';
+
+        -- add code values.
+            INSERT INTO app_fom.project_plan_code(code, description, create_user) VALUES
+            ('FSP', 'Forest Stewardship Plan', CURRENT_USER), 
+            ('WOODLOT', 'Woodlot License Plan', CURRENT_USER); 
+
+        `);
+
+        console.log('Starting new columns project.project_plan_code, project.woodlot_license_number migration.');
+        await queryRunner.query(`
+        -- add new column: app_fom.project.project_plan_code column
+            ALTER TABLE app_fom.project ADD COLUMN project_plan_code varchar NOT NULL DEFAULT 'FSP' references app_fom.project_plan_code(code);
+            comment on column app_fom.project.project_plan_code is 'Tracks project FOM submission from different licensee plans';
+
+        -- add new index: app_fom.project (project_plan_code)
+            create index IF NOT EXISTS project_project_plan_code_idx on app_fom.project (project_plan_code);
+
+        -- add new column: app_fom.project.woodlot_license_number column
+            ALTER TABLE app_fom.project ADD COLUMN woodlot_license_number varchar(5) NULL;
+            comment on column app_fom.project.woodlot_license_number is 'Woodlot license plan number applies to FOM under WOODLOT plan type';
+        `)
+
+        console.log('Starting fsp_id column drop NOT NULL migration');
+        await queryRunner.query(`
+        -- alter fsp_id to nullable
+            ALTER TABLE app_fom.project ALTER COLUMN fsp_id DROP NOT NULL;  
+        `)
+    }
+
+    async down(queryRunner) {
+        console.log('Starting project (drop columns: project_plan_code, woodlot_license_number, drop table: project_plan_code) migration');
+        await queryRunner.query(`
+        -- drop index
+            drop index IF EXISTS project_project_plan_code_idx;
+
+        -- drop columns - project_plan_code, woodlot_license_number
+            ALTER TABLE app_fom.project DROP COLUMN project_plan_code;
+            ALTER TABLE app_fom.project DROP COLUMN woodlot_license_number;
+    
+        -- add constraint
+            ALTER TABLE app_fom.project ALTER COLUMN fsp_id SET NOT NULL;
+        
+        -- drop table - project_plan_code
+            drop table if exists app_fom.project_plan_code; 
+
+        `);
+
+    }
+
+}
diff --git a/libs/client/typescript-ng/.openapi-generator/FILES b/libs/client/typescript-ng/.openapi-generator/FILES
index fa8a70395..a5dab28b8 100644
--- a/libs/client/typescript-ng/.openapi-generator/FILES
+++ b/libs/client/typescript-ng/.openapi-generator/FILES
@@ -30,6 +30,7 @@ model/projectCommentClassificationMandatoryChangeRequest.ts
 model/projectCommentingClosedDateChangeRequest.ts
 model/projectCreateRequest.ts
 model/projectMetricsResponse.ts
+model/projectPlanCodeEnum.ts
 model/projectPublicSummaryResponse.ts
 model/projectResponse.ts
 model/projectUpdateRequest.ts
diff --git a/libs/client/typescript-ng/model/models.ts b/libs/client/typescript-ng/model/models.ts
index d44c69464..4e7c7825d 100644
--- a/libs/client/typescript-ng/model/models.ts
+++ b/libs/client/typescript-ng/model/models.ts
@@ -11,6 +11,7 @@ export * from './projectCommentClassificationMandatoryChangeRequest';
 export * from './projectCommentingClosedDateChangeRequest';
 export * from './projectCreateRequest';
 export * from './projectMetricsResponse';
+export * from './projectPlanCodeEnum';
 export * from './projectPublicSummaryResponse';
 export * from './projectResponse';
 export * from './projectUpdateRequest';
diff --git a/libs/client/typescript-ng/model/projectCreateRequest.ts b/libs/client/typescript-ng/model/projectCreateRequest.ts
index 8e49e8572..aca79eab2 100644
--- a/libs/client/typescript-ng/model/projectCreateRequest.ts
+++ b/libs/client/typescript-ng/model/projectCreateRequest.ts
@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { ProjectPlanCodeEnum } from './projectPlanCodeEnum';
 
 
 export interface ProjectCreateRequest { 
@@ -23,7 +24,9 @@ export interface ProjectCreateRequest {
      */
     commentingClosedDate: string;
     forestClientNumber: string;
+    projectPlanCode: ProjectPlanCodeEnum;
     fspId: number;
+    woodlotLicenseNumber: string;
     districtId: number;
     operationStartYear: number;
     operationEndYear: number;
diff --git a/libs/client/typescript-ng/model/projectPlanCodeEnum.ts b/libs/client/typescript-ng/model/projectPlanCodeEnum.ts
new file mode 100644
index 000000000..4c26055f1
--- /dev/null
+++ b/libs/client/typescript-ng/model/projectPlanCodeEnum.ts
@@ -0,0 +1,20 @@
+/**
+ * FOM API
+ * API for FOM backend
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export type ProjectPlanCodeEnum = 'FSP' | 'WOODLOT';
+
+export const ProjectPlanCodeEnum = {
+    Fsp: 'FSP' as ProjectPlanCodeEnum,
+    Woodlot: 'WOODLOT' as ProjectPlanCodeEnum
+};
+
diff --git a/libs/client/typescript-ng/model/projectPublicSummaryResponse.ts b/libs/client/typescript-ng/model/projectPublicSummaryResponse.ts
index e73b2b995..ba82e184a 100644
--- a/libs/client/typescript-ng/model/projectPublicSummaryResponse.ts
+++ b/libs/client/typescript-ng/model/projectPublicSummaryResponse.ts
@@ -15,7 +15,9 @@ export interface ProjectPublicSummaryResponse {
     id: number;
     name: string;
     geojson: object;
-    fspId: number;
+    projectPlanCode: string;
+    fspId?: number;
+    woodlotLicenseNumber?: string;
     forestClientName: string;
     workflowStateName: string;
 }
diff --git a/libs/client/typescript-ng/model/projectResponse.ts b/libs/client/typescript-ng/model/projectResponse.ts
index 42af8d838..2ed96b213 100644
--- a/libs/client/typescript-ng/model/projectResponse.ts
+++ b/libs/client/typescript-ng/model/projectResponse.ts
@@ -30,7 +30,9 @@ export interface ProjectResponse {
      * ISO-formatted date
      */
     validityEndDate: string;
-    fspId: number;
+    projectPlanCode: string;
+    fspId?: number;
+    woodlotLicenseNumber?: string;
     district: DistrictResponse;
     forestClient: ForestClientResponse;
     workflowState: WorkflowStateCode;
diff --git a/libs/client/typescript-ng/model/projectUpdateRequest.ts b/libs/client/typescript-ng/model/projectUpdateRequest.ts
index 29323aae6..d7d0eecb6 100644
--- a/libs/client/typescript-ng/model/projectUpdateRequest.ts
+++ b/libs/client/typescript-ng/model/projectUpdateRequest.ts
@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import { ProjectPlanCodeEnum } from './projectPlanCodeEnum';
 
 
 export interface ProjectUpdateRequest { 
@@ -22,7 +23,9 @@ export interface ProjectUpdateRequest {
      * ISO-formatted date
      */
     commentingClosedDate?: string;
+    projectPlanCode?: ProjectPlanCodeEnum;
     fspId?: number;
+    woodlotLicenseNumber?: string;
     districtId?: number;
     operationStartYear?: number;
     operationEndYear?: number;
diff --git a/public/src/app/applications/app-map/app-map.component.ts b/public/src/app/applications/app-map/app-map.component.ts
index 831bf0101..ee5cc4138 100644
--- a/public/src/app/applications/app-map/app-map.component.ts
+++ b/public/src/app/applications/app-map/app-map.component.ts
@@ -2,7 +2,7 @@ import {
     AfterViewInit, ApplicationRef, Component, ComponentFactoryResolver, ElementRef, EventEmitter, Injector, Input, OnChanges,
     OnDestroy, OnInit, Output, SimpleChanges
 } from '@angular/core';
-import { ProjectPublicSummaryResponse } from '@api-client';
+import { ProjectPlanCodeEnum, ProjectPublicSummaryResponse } from '@api-client';
 import { MapLayersService, OverlayAction } from '@public-core/services/mapLayers.service';
 import { UrlService } from '@public-core/services/url.service';
 import { MapLayers } from '@utility/models/map-layers';
@@ -55,7 +55,8 @@ export class AppMapComponent implements OnInit, AfterViewInit, OnChanges, OnDest
   private mapLayers = new MapLayers();
 
   readonly defaultBounds = L.latLngBounds([48, -139], [60, -114]); // all of BC
-
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
+  
   constructor(
     private appRef: ApplicationRef,
     private elementRef: ElementRef,
@@ -325,10 +326,14 @@ export class AppMapComponent implements OnInit, AfterViewInit, OnChanges, OnDest
       const commentingTxt = (projectSummary.workflowStateName === 'Finalized' || 
                            projectSummary.workflowStateName === 'Expired') ?
                           ', Commenting Closed': 
-                          ''
+                          '';
+      const fomProjectPlanTxt = (projectSummary.projectPlanCode == this.projectPlanCodeEnum.Fsp)? 
+                                `FSP ID: ${projectSummary.fspId}`:
+                                `Woodlot #: ${projectSummary.woodlotLicenseNumber}`
+
       const title = `${projectSummary.name}\n` + 
         `${projectSummary.forestClientName}\n` + 
-        `FSP ID: ${projectSummary.fspId}\n` +
+        `${fomProjectPlanTxt}\n` +
         `${projectSummary.workflowStateName}${commentingTxt}`; // This will be Leaflet hover
       const marker = L.marker(L.latLng(projectSummary.geojson['coordinates'][1], projectSummary.geojson['coordinates'][0]), {title: title})
         .setIcon(markerIcon)
diff --git a/public/src/app/applications/app-map/marker-popup/marker-popup.component.html b/public/src/app/applications/app-map/marker-popup/marker-popup.component.html
index 33f7dbfa3..d59eb2a4b 100644
--- a/public/src/app/applications/app-map/marker-popup/marker-popup.component.html
+++ b/public/src/app/applications/app-map/marker-popup/marker-popup.component.html
@@ -7,8 +7,9 @@
 
   <div class="applicant-name">{{projectSummary.forestClientName | titlecase}}</div>
   <div class="purpose">{{projectSummary.name}}</div>
-  <div><strong>FSP ID: {{projectSummary.fspId}}</strong></div>
-  
+  <div *ngIf="projectSummary.projectPlanCode == projectPlanCodeEnum.Fsp"><strong>FSP ID: {{projectSummary.fspId}}</strong></div>
+  <div *ngIf="projectSummary.projectPlanCode == projectPlanCodeEnum.Woodlot"><strong>Woodlot License: {{projectSummary.woodlotLicenseNumber}}</strong></div>
+
   <ul class="status-container">
     <li class="workflow-status"
       [ngClass]="{
diff --git a/public/src/app/applications/app-map/marker-popup/marker-popup.component.ts b/public/src/app/applications/app-map/marker-popup/marker-popup.component.ts
index 46d081d73..8465f4474 100644
--- a/public/src/app/applications/app-map/marker-popup/marker-popup.component.ts
+++ b/public/src/app/applications/app-map/marker-popup/marker-popup.component.ts
@@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
-import { ProjectPublicSummaryResponse } from '@api-client';
+import { ProjectPlanCodeEnum, ProjectPublicSummaryResponse } from '@api-client';
 import { StateService } from '@public-core/services/state.service';
 import { UrlService } from '@public-core/services/url.service';
 import * as _ from 'lodash';
@@ -15,7 +15,8 @@ import { Panel } from '../../../applications/utils/panel.enum';
 export class MarkerPopupComponent {
   public projectSummary: ProjectPublicSummaryResponse;
   public workflowStatus = _.keyBy(this.stateSvc.getCodeTable('workflowStateCode'), 'code');
-
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
+  
   constructor(
     private stateSvc: StateService,
     public urlService: UrlService
diff --git a/public/src/app/applications/app-public-notices/public-notices-panel.component.html b/public/src/app/applications/app-public-notices/public-notices-panel.component.html
index ca4eaee0f..dd8f396fc 100644
--- a/public/src/app/applications/app-public-notices/public-notices-panel.component.html
+++ b/public/src/app/applications/app-public-notices/public-notices-panel.component.html
@@ -102,8 +102,16 @@ <h3 class="title">No public notices found.</h3>
       </div>
 
       <div class="row">
-        <div class="col-5 col-sm-2 bold">FSP ID: </div>
-        <div class="col-7 col-sm-4 no-padding">{{pn.project.fspId}}</div>
+        <div class="col-5 col-sm-2 bold" 
+          *ngIf="pn.project.projectPlanCode == projectPlanCodeEnum.Fsp">FSP ID: </div>
+        <div class="col-7 col-sm-4 no-padding" 
+          *ngIf="pn.project.projectPlanCode == projectPlanCodeEnum.Fsp">{{pn.project.fspId}}</div>
+
+        <div class="col-5 col-sm-2 bold" 
+          *ngIf="pn.project.projectPlanCode == projectPlanCodeEnum.Woodlot">Woodlot License: </div>
+        <div class="col-7 col-sm-4 no-padding" 
+          *ngIf="pn.project.projectPlanCode == projectPlanCodeEnum.Woodlot">{{pn.project.woodlotLicenseNumber}}</div>
+
         <div class="col-5 col-sm-2 bold">District: </div>
         <div class="col-7 col-sm-4 no-padding">{{pn.project.district?.name}}</div>
       </div>
diff --git a/public/src/app/applications/app-public-notices/public-notices-panel.component.ts b/public/src/app/applications/app-public-notices/public-notices-panel.component.ts
index 1f1ad44d4..cb91a2fc9 100644
--- a/public/src/app/applications/app-public-notices/public-notices-panel.component.ts
+++ b/public/src/app/applications/app-public-notices/public-notices-panel.component.ts
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { MatCardModule } from '@angular/material/card';
 import { MatAccordion, MatExpansionModule } from '@angular/material/expansion';
 import { MatTooltipModule } from '@angular/material/tooltip';
-import { ProjectResponse, PublicNoticePublicFrontEndResponse, PublicNoticeService } from '@api-client';
+import { ProjectPlanCodeEnum, ProjectResponse, PublicNoticePublicFrontEndResponse, PublicNoticeService } from '@api-client';
 import { ShortenPipe } from '@public-core/pipes/shorten.pipe';
 import { UrlService } from '@public-core/services/url.service';
 import * as _ from 'lodash';
@@ -30,7 +30,7 @@ import moment = require('moment');
 export class PublicNoticesPanelComponent implements OnInit {
   @Output() update = new EventEmitter<IUpdateEvent>();
   @ViewChild(MatAccordion) accordion: MatAccordion;
-  
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
   isLoading = false;
   pNotices: Array<PublicNoticePublicFrontEndResponse>;
   initialPNotices: Array<PublicNoticePublicFrontEndResponse>;
diff --git a/public/src/app/applications/details-panel/details-panel.component.html b/public/src/app/applications/details-panel/details-panel.component.html
index 133d15bfb..a5dc25770 100644
--- a/public/src/app/applications/details-panel/details-panel.component.html
+++ b/public/src/app/applications/details-panel/details-panel.component.html
@@ -70,9 +70,12 @@ <h3>FOM Details</h3>
           <li *ngIf="project.bctsMgrName && project.bctsMgrName.length > 0">
             Timber Sales Manager Name: <span class="bold">{{project.bctsMgrName | titlecase}}</span>
           </li>
-          <li>
+          <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Fsp">
             FSP ID: <span class="bold">{{project.fspId}}</span>
           </li>
+          <li *ngIf="project.projectPlanCode == projectPlanCodeEnum.Woodlot">
+            Woodlot License: <span class="bold">{{project.woodlotLicenseNumber}}</span>
+          </li>
           <li>
             Period of operations: 
                 <span class="bold" *ngIf="project.operationStartYear">{{project.operationStartYear}} to {{project.operationEndYear}}</span>
diff --git a/public/src/app/applications/details-panel/details-panel.component.ts b/public/src/app/applications/details-panel/details-panel.component.ts
index 072515696..4f7404b39 100644
--- a/public/src/app/applications/details-panel/details-panel.component.ts
+++ b/public/src/app/applications/details-panel/details-panel.component.ts
@@ -2,8 +2,8 @@ import { CommonModule } from '@angular/common';
 import { Component, ElementRef, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 import { MatTooltipModule } from '@angular/material/tooltip';
 import {
-    AttachmentResponse, AttachmentService, ProjectResponse, ProjectService,
-    SpatialFeaturePublicResponse, SpatialFeatureService, WorkflowStateCode
+  AttachmentResponse, AttachmentService, ProjectPlanCodeEnum, ProjectResponse, ProjectService,
+  SpatialFeaturePublicResponse, SpatialFeatureService, WorkflowStateCode
 } from '@api-client';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { faArrowUpRightFromSquare } from '@fortawesome/free-solid-svg-icons';
@@ -62,6 +62,7 @@ export class DetailsPanelComponent implements OnDestroy, OnInit {
   
   public periodOperationsTxt = "This FOM can be relied upon by the FOM holder for the purpose of a cutting permit or road permit application, until the date three years after commencement of the public review and commenting period. FOMs published by BC Timber Sales can be relied upon for the purpose of a cutting permit or road permit application, or the issuance of a Timber Sales License until the date three years after conclusion of the public review and commenting period."
   public periodOperationsTooltipTxt = "An FSP holder has three years to apply for a cutting permit or road permit for cutblocks and roads displayed on a FOM. This is called the validity period, it starts on the day commenting opens on a FOM. For BC Timber Sales the validity period starts on the day commenting closes."
+  readonly projectPlanCodeEnum = ProjectPlanCodeEnum;
 
   constructor(
     public modalService: NgbModal,