Added Complex Search capabilities