Removed cim type info as this is being replaced by type_key