Pradeep : Cloud related changes