Adding the ability to specify a remote port as well as / instead of a local port