Added further support for annotation mechanism.