Add heater simulator some broker refactoring