#1 Continue modifications according to event-based, Client-focused WAMP model