I took a little time to think some more about this and pushed a little working prototype of some ideas I had https://review.openstack.org/#/c/64733/1. Comments about the approach are most welcome. Note that I minimized any refactoring of the existing hierarchy for this prorotype. -David