Added eval and constraints