PTS-24 refactoring model in step2 to work with new response object
Fixed merge conflict