Upgraded to new db creation scripts