Working on annotator class
Update some documentation