More serializers and API cleanups