Roger, can you please refactor it so that we don't have code duplication? I think our old getContext should be modified to call your new getContext with zoneId set to null.