Json optimization

Migration to new serializers.