Site verb updates, refactoring