Add support for "port" switch in command and helper