Updated filewatcher