Updating search methods - without testing
New classes are added
new classes added, merged from aliwi