Changed to use HTTP Listener