Port to the pkgdb2

:fire: