[Feature] Portal enhancements