Add all PUT routes and change few things here and here