Updated with Search interface