New version supporting incremental usage