added mapping to new dbmodel