Adding basic module loading support