Changed use of (UN)USED_MODELS to use id's instead of names to support packages.