StoreDao extended; UnitsDao maked functional