Rejiggered all of the imports for contrib_hooks