Database overhaul