A few optimisations
Improve model selection