more serializer changes