Adapt guide to new API