Making fixes to the way that data is encoded in the storage manager. It ...

...now uses our data encoders rather than doing standard serialization