Add more serialization stuff