Tweaked database creation script