Starting to implement lambda search support