Switch to automatic mass_require