Added some missing (Sub-)Type Mappings