diff --git a/libs/xassets/xaudiochannelmap.cpp b/libs/xassets/xaudiochannelmap.cpp
index e654f77..a50ab67 100644
--- a/libs/xassets/xaudiochannelmap.cpp
+++ b/libs/xassets/xaudiochannelmap.cpp
@@ -5,7 +5,7 @@ XAudioChannelMap::XAudioChannelMap()
     , mEntryCount(0)
     , mEntries(QVector<XAudioChannelMapEntry*>())
 {
-
+    SetName("Audio Channel Map");
 }
 
 XAudioChannelMap::~XAudioChannelMap()
@@ -32,15 +32,13 @@ void XAudioChannelMap::SetMapEntry(int aIndex, XAudioChannelMapEntry *aEntry)
     mEntries[aIndex] = aEntry;
 }
 
-void XAudioChannelMap::ParseData(QDataStream *aStream)
+void XAudioChannelMap::ParseData(XDataStream *aStream)
 {
-    *aStream >> mEntryCount;
+    mEntryCount = aStream->ParseUInt8(QString("%1 entry count").arg(GetName()));
 
     aStream->skipRawData(3);
 
-    quint32 entriesPtr;
-    *aStream >> entriesPtr;
-
+    quint32 entriesPtr = aStream->ParseInt32(QString("%1 entries ptr").arg(GetName()));
     if (entriesPtr)
     {
         mEntries.resize(mEntryCount);