Specific changes for AICP