Added some hooks