Updated to deal with multi-part domain types.