filesearch added, changes to Model API