added support for dot, bracket or mixed notation in variable references