see how easy it is to avoid doing this manual mapping here - should be able to extract the mapping to a central helper class or method