Create new Originator component and adjust code to match this change