Upgrade to latest trogdir_models