Add image watch support