Enhance impl of workflow