Hack together support for new 'Expected' format