Add non-inotify watching and adapter pattern