* Add default mappings

* Make lookup re-entrant such that sub classes will be created for types