Add select evaluation and better execution