updated model; switched to orika for mapping