Instead of having a fixed set of contexts available, change it so it can be made dynamically, and so attributes can be natively grouped by context in the attribute files.