Changed the general annotations to the override format.