Does consideration of psychopathy and sexual deviance add to the predictive validity of the static-99R?

Does consideration of psychopathy and sexual deviance add to the predictive validity of the static-99R?