Improved descriptions, added some fields