Additions/changes for pdb