added no-database switch