Component and Datasource rebuild