Fixed Serialization API a bit