After last commit, we don't need DatabaseType anymore