Catching up to the new adapter API.