diff --git a/src/controllers/RunnerTeamController.ts b/src/controllers/RunnerTeamController.ts
index d06ccce..5b97f2b 100644
--- a/src/controllers/RunnerTeamController.ts
+++ b/src/controllers/RunnerTeamController.ts
@@ -54,7 +54,7 @@ export class RunnerTeamController {
 	async post(@Body({ validate: true }) createRunnerTeam: CreateRunnerTeam) {
 		let runnerTeam;
 		try {
-			runnerTeam = await createRunnerTeam.toRunnerTeam();
+			runnerTeam = await createRunnerTeam.toEntity();
 		} catch (error) {
 			throw error;
 		}
diff --git a/src/controllers/TrackController.ts b/src/controllers/TrackController.ts
index b9f8d30..6ea2907 100644
--- a/src/controllers/TrackController.ts
+++ b/src/controllers/TrackController.ts
@@ -55,7 +55,7 @@ export class TrackController {
 		@Body({ validate: true })
 		track: CreateTrack
 	) {
-		return new ResponseTrack(await this.trackRepository.save(track.toEntity()));
+		return new ResponseTrack(await this.trackRepository.save(await track.toEntity()));
 	}
 
 	@Put('/:id')
diff --git a/src/models/actions/create/CreateAddress.ts b/src/models/actions/create/CreateAddress.ts
index 0111736..c399bb8 100644
--- a/src/models/actions/create/CreateAddress.ts
+++ b/src/models/actions/create/CreateAddress.ts
@@ -56,7 +56,7 @@ export class CreateAddress {
     /**
      * Creates a new Address entity from this.
      */
-    public toEntity(): Address {
+    public async toEntity(): Promise<Address> {
         let newAddress: Address = new Address();
 
         newAddress.address1 = this.address1;
diff --git a/src/models/actions/create/CreateRunnerTeam.ts b/src/models/actions/create/CreateRunnerTeam.ts
index a0c955b..fc5c310 100644
--- a/src/models/actions/create/CreateRunnerTeam.ts
+++ b/src/models/actions/create/CreateRunnerTeam.ts
@@ -37,7 +37,7 @@ export class CreateRunnerTeam extends CreateRunnerGroup {
     /**
      * Creates a new RunnerTeam entity from this.
      */
-    public async toRunnerTeam(): Promise<RunnerTeam> {
+    public async toEntity(): Promise<RunnerTeam> {
         let newRunnerTeam: RunnerTeam = new RunnerTeam();
 
         newRunnerTeam.name = this.name;
diff --git a/src/models/actions/update/UpdateTrack.ts b/src/models/actions/update/UpdateTrack.ts
index c9935f5..409a356 100644
--- a/src/models/actions/update/UpdateTrack.ts
+++ b/src/models/actions/update/UpdateTrack.ts
@@ -37,7 +37,7 @@ export class UpdateTrack {
      * Update a Track entity based on this.
      * @param track The track that shall be updated.
      */
-    public update(track: Track): Track {
+    public async update(track: Track): Promise<Track> {
         track.name = this.name;
         track.distance = this.distance;
         track.minimumLapTime = this.minimumLapTime;