Added more low-level hooks