House keeping on Generator namespace.