Adpat DB wrapper to match the new table format