Fixed api serializer