Better modular loading code