Fix rest endpoints
Finished Soap