Refactor - Add address websocket support