Updated workflow parsing