Improvements in AIF data structure.