Changes for socketio