Add support for configuring a non-default DB