Have updated to use the new mapping methods and rules, as well as adding the mapping.merge descriptor.