Adapt to new method