Sync with hotplate's current abilities, API and code