Added some files from class