Updated with latest version of Portal
Added Module load method