Basic efficiency upgrade to database file