Modified DB scripts to work for 2 different databases