Fixed #39: Separate out the Environment component.