Added watch and shell tasks