Changes to have cpacademy in all areas