Corrected recent commit and split up Scope and Cue Detection