Added some basic (and hard-coded) status and type mappings