Adding Support for Environment variable prefixes