Changed enviroment/context pattern to a single character separator