better Database::Upgrade and minimizing stuff