Evo addition of Doctrine into CW