Add Build watch support

I added more right code.