Changes for AAF integration