Move top level Definition parsing
EnvironmentAdder type alias