changed the description to match te 2.0 structure, added some new options, fixed Class name