Serialisation improvements
code review improvements