[DS-2240] Handle all types of DSOs, not just Items