Added function support via eval