Fixed generated classes + Cosmetics