Prepared infrastructure for Heat support

Change-Id: I8d04588719e56bbb6fa9c3b2be06da34c3d0d65b