Added lambda and if expressions