Improve pretty-printing of datasource lists

Signed-off-by: John Else <john.else@citrix.com>
Add a second data source

Signed-off-by: John Else <john.else@citrix.com>