More changes for lambda functions