Added classifier and other fields