Arrays support added