- Added support for filewatching