I have modified the documentation as required as well as for some attributes