Reimplemented file watching