Added fields to track more system features.
.