Adding support for mentioning port numbers