Changes to enable vet stuff