Update validator to return results object