LPS-33079 Apply refactor to portal properties