Trying to get more re-use between standalone and Annotator plugout