Updated arrangement of datasource