More moving to late loading of modules