Added classes for score handling