Added back watchdir feature
Added back watchdir feature