Changed the internal serialization conventions