Adds support for named variables