hook type improvements