Architecture changes.