Updated to include beat worker supervisor