Added the remaining attributes
Made some slight changes in the code