Address Hierarchy

Hi @rafanetow,

I responded here. Let’s follow up on that thread.