Fixing the new backend (still need to store env in order to work at execution time)