Refactor for AIM XML Changes