Include component type in type ids