Make some refactoring related to database file.