Updated SearchSpace