Add Serializer support