Add Build watch support