Support results, minorly amend schema.