Should we have the raw versions return values to match the data that is returned from the api as closely as possible and leave the adapter calls in the generic service?