Put addition of TargetEnvironment in header in a separate class