(feat) Added handling for lambdas