Added eval functionality