Adding variable expansion
Added support for expanded identifiers