map support + variable name escaping