added port and server tags