Added support for POST and PUT