Changing handling of database to be injected from the top.
Changing handling of database to be injected from the top.