Commit 4 - dataContainer struct changes