added more type mappings