Update for Master<->Worker implementation