Some improvements about worker edition