Added Enteties creation and Store prepopulation