Moved database dict to top because one of the imports requires it

Change-Id: Iaecbe4565329aa254dd5e2a0e92d3430018aff5d