Split heuristic calculation by type
Add configuration dependent heuristics