Refactored go.vouchers into go.services using view definitions