Add Array support
Couple bug fixes