Adapt to Lunchbox/Pression refactoring