Add optional state towards datasource