Added parsing of whole annotation with parameters