lot of changes as we are now using the models automatically generated by swagger from API spec
lot of changes as we are now using the models automatically generated by swagger from API spec

chandanchowdhury/HSPC,chandanchowdhury/HSPC