Add Build watch support

ResourceVersion should be the last argument, not the first