Now using constants for System property and environment variable names