Updated descriptors to new package defs