Added NHL support