Add Gaze and subdirectory watching support