Adapt to DatabaseAdapter switch to AR