Updated and added more files