Changed data extraction to consider sport type, added Data class, added Unit class to utils, fixed test accordingly