Peter Braun might be worth doing this, and - for some time, allow both: properties and env_vars