Little changes in classes