Updated the controller to include custom serializers