Fix latter endpoint added and better handling for delete operations.