Moved more methods out of HomeAssistant object