Add serializer support