Update HBDAO classes with latest HBCore compatibility