Adding of Dmytro's version of DB