Start of migration to websocket