ORACLETOOLS-96: Refactored how Environment Variables may be defined