Added some more hooks