Added module loading support