Moved score to separate service