Refactor syntax unicode mc session