Changes to make it work for flipkart env