Added functionality to perform searches based on arbitrary attributes