Database name is now a parameter, rather than a configuration option
Added database tool