diff --git a/src/main/kotlin/com/cubetiqs/demo/axon/entity/BankAccount.kt b/src/main/kotlin/com/cubetiqs/demo/axon/entity/BankAccount.kt
index 5f7aed6..4c072f7 100644
--- a/src/main/kotlin/com/cubetiqs/demo/axon/entity/BankAccount.kt
+++ b/src/main/kotlin/com/cubetiqs/demo/axon/entity/BankAccount.kt
@@ -4,8 +4,6 @@ import java.io.Serializable
 import java.math.BigDecimal
 import java.util.UUID
 import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.GenerationType
 import javax.persistence.Id
 import javax.persistence.Table
 
@@ -13,7 +11,6 @@ import javax.persistence.Table
 @Table(name = "bank_accounts")
 data class BankAccount(
     @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
     var id: UUID? = null,
 
     var owner: String? = null,
diff --git a/src/main/kotlin/com/cubetiqs/demo/axon/projection/BankAccountProjection.kt b/src/main/kotlin/com/cubetiqs/demo/axon/projection/BankAccountProjection.kt
index b536227..180587c 100644
--- a/src/main/kotlin/com/cubetiqs/demo/axon/projection/BankAccountProjection.kt
+++ b/src/main/kotlin/com/cubetiqs/demo/axon/projection/BankAccountProjection.kt
@@ -62,6 +62,6 @@ class BankAccountProjection @Autowired constructor(
     @QueryHandler
     fun handle(query: FindBankAccountQuery): BankAccount? {
         log.debug("Handling FindBankAccountQuery query: {}", query)
-        return this.bankAccountRepository.findById(query.accountId).orElse(null)
+        return this.bankAccountRepository.findById(query.id).orElse(null)
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/com/cubetiqs/demo/axon/query/FindBankAccountQuery.kt b/src/main/kotlin/com/cubetiqs/demo/axon/query/FindBankAccountQuery.kt
index baf41cf..0a6d704 100644
--- a/src/main/kotlin/com/cubetiqs/demo/axon/query/FindBankAccountQuery.kt
+++ b/src/main/kotlin/com/cubetiqs/demo/axon/query/FindBankAccountQuery.kt
@@ -3,5 +3,5 @@ package com.cubetiqs.demo.axon.query
 import java.util.UUID
 
 data class FindBankAccountQuery(
-    val accountId: UUID
+    val id: UUID
 )
\ No newline at end of file
diff --git a/src/main/kotlin/com/cubetiqs/demo/axon/service/AccountCommandServiceImpl.kt b/src/main/kotlin/com/cubetiqs/demo/axon/service/AccountCommandServiceImpl.kt
index fb40f0f..29dfdb4 100644
--- a/src/main/kotlin/com/cubetiqs/demo/axon/service/AccountCommandServiceImpl.kt
+++ b/src/main/kotlin/com/cubetiqs/demo/axon/service/AccountCommandServiceImpl.kt
@@ -44,6 +44,4 @@ class AccountCommandServiceImpl @Autowired constructor(
             )
         )
     }
-
-
 }
\ No newline at end of file
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 1a349c6..343cda3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,6 +2,8 @@ server:
   port: 8182
 
 spring:
+  application:
+    name: axon-demo
   datasource:
     driverClassName: org.postgresql.Driver
     url: jdbc:postgresql://${POSTGRES_HOST:192.168.0.202}:${POSTGRES_PORT:5432}/${POSTGRES_DB:axon_demo}
@@ -33,4 +35,9 @@ spring:
 
 axon:
   serializer:
-    general: jackson
\ No newline at end of file
+    general: jackson
+  axonserver:
+    servers: 192.168.0.202
+
+logging:
+  level.root: debug
\ No newline at end of file