Updated Create_DB, index and test-data