diff --git a/src/models/Participant.ts b/src/models/Participant.ts
index ca8f2ec..2b356a3 100644
--- a/src/models/Participant.ts
+++ b/src/models/Participant.ts
@@ -7,6 +7,7 @@ import {
   IsPhoneNumber,
   IsString,
 } from "class-validator";
+import { Address } from "./Address";
 
 /**
  * Defines the participant interface.
@@ -52,7 +53,7 @@ export abstract class Participant {
   @Column()
   @IsOptional()
   //TODO: Relationship
-  address?: Location;
+  address?: Address;
 
   /**
    * The participant's phone number.
diff --git a/src/models/RunnerOrganisation.ts b/src/models/RunnerOrganisation.ts
index 346d75a..3166964 100644
--- a/src/models/RunnerOrganisation.ts
+++ b/src/models/RunnerOrganisation.ts
@@ -1,6 +1,7 @@
 import { Entity, Column } from "typeorm";
 import { IsOptional,} from "class-validator";
 import { RunnerGroup } from "./RunnerGroup";
+import { Address } from "./Address";
 
 /**
  * Defines a runner organisation (business or school for example).
@@ -15,5 +16,5 @@ export class RunnerOrganisation extends RunnerGroup {
   @Column()
   @IsOptional()
   //TODO: Relationship
-  address?: Location;
+  address?: Address;
 }
\ No newline at end of file