Tweaking to support the worker app