DB Tool redesign and simplify