Refactor augment to be service-agnostic