Added fold envinronment to handler callers.