Added support for WAMP