Refactored for pkgtools automatic config generations