Complete DB part

Complete DB part