Current update to classes