JAL-2403 JAL-1483 changes to ScoreModelI hierarchy and signatures to