Added support for data folder file watching