Removed use of eval