Added support for variables in indexing operators