Adds support for context arrays in #17