Added some custom code to the web api helper,