Updated serializers