Prepared infrastructure for Heat support

Change-Id: Ic090308d831ec24cc4ea3cc2f3a438a2e53a58b5