Can now supply a database directory