Made all classes final
Resolved merge conflict in WorkerImpl