Small refactoring to share more code

We should use a base class to share the most code between the two workers.