Added constants for environment variable and property names
Using constants now for System property names (as well as environment variables)