Add basic support for enhanced portals 2