Added some hooks to IGenerator