AM-80 : Introduce more constants