Shared: Re-factor the model generator and put the heuristic queries in its own module.