Quick changes to clean up api using serializer save