Improve getDataSourceValues so model knows what attribute it's dealing w...

...ith