Use updated class