Refactor results command to use the builder