added field for database filename
resolved conficts