Improving watch files list