Added option to handle incremental collection, disabled by default