Add watch & clean