Yep, sounds good. I will add this hierarchical lookup.