Some changes in classes