changes in classes structure