Adopt latest env-properties