Work on array support

Fixes #484