Added support for array variables