diff --git a/build.gradle b/build.gradle
index 4409be0..e23deb1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 group = 'io.edpn.backend'
-version = '0.0.4-SNAPSHOT'
+version = '0.0.5-SNAPSHOT'
 compileJava.options.encoding = 'UTF-8'
 
 repositories {
diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java
index fe18ec5..04bc26b 100644
--- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java
+++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java
@@ -21,7 +21,7 @@ public LocalDateTime messageTimeStamp() {
 
         public record Payload(
                 @JsonProperty("SystemAddress") long systemAddress,
-                @JsonProperty("StarSystem")String starSystem,
+                @JsonProperty("StarSystem") String starSystem,
                 @JsonProperty("StarPos") double[] starPos,
                 @JsonProperty("MarketID") long marketId,
                 @JsonProperty("horizons") boolean horizons,
@@ -31,7 +31,13 @@ public record Payload(
                 @JsonProperty("Name") String name,
                 @JsonProperty("Latitude") long latitude,
                 @JsonProperty("Longitude") long longitude,
-                @JsonProperty("timestamp") String timestamp
+                @JsonProperty("timestamp") String timestamp,
+                @JsonProperty("StationGovernment") String stationGovernment,
+                @JsonProperty("StationAllegiance") String stationAllegiance,
+                @JsonProperty("StationEconomies") Economy[] stationEconomies,
+                @JsonProperty("StationFaction") Faction stationFaction,
+                @JsonProperty("StationServices") String[] stationServices,
+                @JsonProperty("StationEconomy") String stationEconomy
         ) implements EddnMessage.Payload {
 
             @JsonProperty(value = "event", access = JsonProperty.Access.READ_ONLY)
diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java
index f1a97cc..8600a9f 100644
--- a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java
+++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java
@@ -41,9 +41,6 @@ public record Commodity(
                 @JsonProperty("statusFlags") String[] statusFlags
         ) {}
 
-        record Economy(
-                @JsonProperty("name") String name,
-                @JsonProperty("proportion") double proportion
-        ) {}
     }
+
 }
diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java
new file mode 100644
index 0000000..05bb26d
--- /dev/null
+++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java
@@ -0,0 +1,8 @@
+package io.edpn.backend.messageprocessorlib.application.dto.eddn;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record Economy(
+        @JsonProperty("name") String name,
+        @JsonProperty("proportion") double proportion
+) {}
diff --git a/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java
new file mode 100644
index 0000000..983d0fb
--- /dev/null
+++ b/src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java
@@ -0,0 +1,7 @@
+package io.edpn.backend.messageprocessorlib.application.dto.eddn;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public record Faction(
+        @JsonProperty("Name") String name
+) {}