Work on term preprocessing