Update pbi-manager to use new fields in pbing modules