Adding lambda support