--removed hardcodings
Merge pull request #60 from pradpnayak/UCCPAR-427

--removed hardcodings