Minor refactor, added PUT and DELETE