Little enhacement with lambdas. No generic instantiation yet.