added support for named variables