I streamlined the EnvironmentFactory.parseXxxx methods to the new stream package and replaced all the parse methods with one method like this

public static EnvironmentFactory parse(StreamSource streamSource);