Improve model results set handling