Fixed database_file namespace