Changed Environment to hold Objects instead of Entities