Added more hooks