Changed the structure base class and order in dbs