Make submodule loading more lazy