Added support for Workers