Added heating support and more