Can you just make it part of the mapping infrastructure? Then the defaulting is also handled there.