Adding support for all and spread