Added support to raw-score validation