Fixes to the Lambda class constructors to reflect the new class structure