Modification on Database creation script