Moved dependencies to core.module