PortProperties->PortEntity refactoring