- Add namespace and base class parameters
New catch on "pdg error"