Classes modifications 1