Changed adapter to DB driven