Adding NHL tools