Fixed Database creation issue