updated class structures