Add hostmanager support