1. Reworked so that type infos are looked up using the system type id