Moved data initialization to the data service