refactor ce workflow functionality