Added setup parameter for alternative database names