Added changes to put and post handling