Started adding TRAITS type support to Mapping<>