Added proper parsing of annotation element