Updated module to work with all sports