Add support for custom ports