Adapts to new Completion API