Refactored Incremental API