Moved status and added annotator for testing