Port binding refactoring