made module loader compliant