Added support for separate begin/upload ports.