Improve incremental template