Added file watching