Enterprise mapping to deafult value

@decosta,

Can you take a look at this thread and see if Mark covers it? If not I can try to get some more eyes on it.

Thanks,
Dan