Update to new Lambency changes