rebundled for new database config