Feature/extra type mappings