Better organization for database file