Prepare ground to support other DBs
Fix stupid mistake