Add logic for alternative db name