Added Classes and Lambdas