Refactored bpmn