Update to match latest additions