Added compatibility for Better Workflow