Adding ability to specify protocol and port