Put heuristics in a separate class