MIN - updated class definitions