Moved hooks to be in module file. REOL-74