Added some new changes to allow for mock response