Added optional portals