diff --git a/schema.graphql b/schema.graphql
index 92572efd..1e236e01 100644
--- a/schema.graphql
+++ b/schema.graphql
@@ -264,10 +264,14 @@ type ReserveMetrics @entity {
   allocations: [ReserveAllocationMetrics] @derivedFrom(field: "reserveMetrics")
 }
 
+type Account @entity {
+  id: ID!
+}
+
 type IBCChannel @entity {
   id: ID!
   channelName: String!
-  escrowAddress: String!
+  escrowAccount: Account!
 }
 
 enum TransferType {
@@ -279,9 +283,9 @@ type IBCTransfer @entity {
   id: ID!
   blockTime: Date!
   blockHeight: BigInt!
-  channelName: String!
-  srcAddress: String!
-  destAddress: String!
+  channel: IBCChannel!
+  srcAccount: Account!
+  destAccount: Account!
   denomination: String!
   amount: String!
   transferType: TransferType!