Added classes DiffForm and OneForm