Add support for multiple ports