Adds originator validation, originator now optional