Enhance watched directory handling