WIP for pkgdb2