Further work on Entity serialization