class and dao upgrades