(Airavata-1260) Making suggested modification.