REF: updated class definition