Updated DBAdapter