Add Heat support