Update to handle heat domain requirements