Refactor syntax unicode mc session

I created this new pull request for this branch, because the previous one was closed, so I guess this was the reason it could not update itself with the most recent changes.