Add #put #delete
Refactor.