Added units and assignments to db structure