Remove use of eval to allow compatibility with CSP