Added more sports. Refactored the sport mapper.