Changed to Class Content. Also Parsing the desktop files separately.