Added Some Logic to current database creation.