Improvements to support SirraHockey