Api calls setup
Api calls setup
merged saurabh's changes