AIF Data structure : some improvement in the container type management.