Add message policy and websocket support