Updated Workflow - added factory param