But why wouldn't you be wrapping this at a different layer? We're building a dictionary and then wrapping it up in a list which looks really weird to me. Can you point me towards the other parts of the code that depend on this?