Highlands support + Temperature handler change