Get rid of direct eval usage