Classes updates