Refactoring:
- New Class PortMap
- New Test Class