Refactor champ_builder from instance to service class