Add basic delegate mode
add the delegate mode search support