[v.1.6.0] Improvements in the newly added portal modes