Add internal-port support