Added environment variable overrides to properties