Add support of annotations