Simplifed type mappings. Closed issue #23.