#23 added $(ContextId) token parsing