add address and port parsing