Updated serializer