Keep evals data separate from main payload

This allows the evals mechanism to work with arrays