Added more mode hooks