Roni | BSHR-400 | Locaiton hierarchy updated