Added support to @Annotations