Adapts to new extension API