added changes for HEAT environment