Refactor the Wrapper class to generate closures by default and avoid usage of 'eval'