* Change substitution semantics - something like $name for roster name, $jid for jid etc * use parser?