Add static instance_type fields

For ease in indexing and querying by type.