Simplifying and making things compliant with the new worker api