Better support for multiple models directory

Better support for multiple models directory