Add support to look for port in hostname