Added modifications to annotators