Some changes in classes

There's some changes