Added Entities and environments to framework