added AZh and renamed ana-types to make it more clear