Update sample parameter classification scheme to include higher level gr...

...oupings