Got rid of home-grown InstanceDataSource component