Serializer and other changes