Added support for Lambdas