Updated classes with completed files