Added more to PopulateDatabase