Add Behavior/Feature Changes for AAA 0.20