Incremental updates and refactoring