FIX: Better DB upgrade