Added support for port and path listener