add more type mappings