Moving service logic to resolver and converter