vet refactor - messages are extension agnostic