Added more serialization stuff