Annotations from old-master refactored