Add search procedure and class