Adapt to new APIs