New helpers and general approach to module loading