Removing hard coded db name