Upgrade to pathwatcher 2.0