Added support for naming databases