Added annotators ref support