Serialization support added