Adding support for port as integer / string