diff --git a/libs/xassets/xaudiopacketaligned.cpp b/libs/xassets/xaudiopacketaligned.cpp
index 24e823a..26b9e64 100644
--- a/libs/xassets/xaudiopacketaligned.cpp
+++ b/libs/xassets/xaudiopacketaligned.cpp
@@ -8,7 +8,7 @@ XAudioPacketAligned::XAudioPacketAligned()
     , aXmaLoop()
     , mContext()
 {
-    
+    SetName("Audio Packet Aligned");
 }
 
 XAudioPacketAligned::~XAudioPacketAligned()
@@ -16,14 +16,11 @@ XAudioPacketAligned::~XAudioPacketAligned()
     
 }
 
-void XAudioPacketAligned::ParseData(QDataStream *aStream)
+void XAudioPacketAligned::ParseData(XDataStream *aStream)
 {
-    qint32 bufferPtr, contextPtr;
-
-    *aStream
-        >> bufferPtr
-        >> mBufferSize
-        >> mLoopCount;
+    qint32 bufferPtr = aStream->ParseInt32(QString("%1 buffer ptr").arg(GetName()));
+    mBufferSize = aStream->ParseUInt32(QString("%1 buffer size").arg(GetName()));
+    mLoopCount = aStream->ParseUInt32(QString("%1 loop count").arg(GetName()));
 
     for (int i = 0; i < 6; i++)
     {
@@ -31,15 +28,16 @@ void XAudioPacketAligned::ParseData(QDataStream *aStream)
         loop.ParseData(aStream);
     }
 
-    *aStream >> contextPtr;
+    qint32 contextPtr = aStream->ParseInt32(QString("%1 context ptr").arg(GetName()));
 
     if (bufferPtr)
     {
         aStream->readRawData(mBuffer.data(), mBufferSize);
     }
+
     if (contextPtr)
     {
-        *aStream >> mContext;
+        mContext = aStream->ParseInt8(QString("%1 context").arg(GetName()));
     }
 }