Added AAF Integration related changes