Modify GridSearch Class