DB and Class models updated