Added mapping shortcut for data types (and enumeratedTypes)