Implemented in new database logic
New database creation logic working