Adapt to new vector interface