Added Entities creation and Store prepopulation