Added caller-defined stop-lists