Started work on refactoring WebSocket server events and subscriptions