Added variable expansion