Changes to take advantage of new rest builder utility classes