It may be too much, however let's think about if we can leverage AutoMapper here as well.