Reworked HEAT template to support meta data