Make databases more generic