Updated to work with latest version of Portal (6.0.0.0)