o Updated models to use cluse_name factor