Incremental architectural improvements