Updated context to use new array format