Can now handle local model repository