Add toon and cvd formulae