Improve the Serializer