@mseaton - am sorry I have not been able to respond to your queries as I have been away with limited internet service. I try to edit the address mapping template but it does not effect, however what I decided to do regarding address hierarchy, was just to edit the address labels via OpenMRS, manage address hierarchy and add fields where necessary. Base on my organisation needs and the interaction with Bahmni, little customization is just required. (Thanks to Bahmni Developers’ Team), notwithstanding the little customization, I will try to commit it into github repository. @apaule - that’s great breakdown, thank you so much.