Optimize workflow to follow the new rule