Improve. delegate to the Select from Builder