Making the use of annotation consistent