Removing reference dependency from annotator