Student Indicator like attribute to capture TEA's key/value pair information with a set of descriptors

TEA has a need to capture Economic-Disadvantage-Code, ADA-Eligibility-Code... that are key value pairs.  They are wanting to capture Economic Disadvantaged status from the perspective of the family income vs student's participation in a FRL program  Please see the screen shot and the link below.  They don't want to collect this in StudentIndicator attribute as this has string values for the indicator name and indicator.  They want to have descriptor values for these.  I proposed a following approach in the TEA-6 ticket  mocking the StudentIndicator but with a set of descriptors.  Please confirm if this is the right approach.  

We noted a similar need from WI to capture digital equity data as well.  

https://tealprod.tea.state.tx.us/TWEDS/84/0/0/0/CodeTable/List/10906

https://tracker.ed-fi.org/browse/TEA-6