Fixing bug and adding support for ArrayExpressions