Merge all handling of annotations into single class #12