enhance the package defs handling