FAIMS-529 - modify vocabulary to have the hierarchy