Add common_name, hierarchy processing