GPII-209: Removed all demands except for get and set for data source.