Adds support for eval and better trace output