Use new database

Use new database

Other features, see Commit 404f57ff1fa1e353cec54085068ca98f71e46ed4