Yah. PID and DSID would be nice. 

Also do we need to change the Exception class to allow the other arrangements to be NULL?