Add factory methods
Change to use factories to create Lambda instances