Add types to external type list & fix wrong entries in ModelBuilder