Datasource and contextSystem fix for the demo, to be cleaned!