Updating to new serializer api