More serialization stuff added