Add support for the following:
Of course, these additions will need to be supported in the various XxxxDataSourceItem classes.