Updated with latest version of Portal
Removed old loading logic and replaced with Module.Load