Changed dataindexer usage condition