Adding module loading (feature #7)