Adapting SearchModel for new implementation