Continuing PortManager refactoring
More PortId refactoring