Mbst 9893 more granular uploads

Would it be possible to extract the logic for each case in a dedicated method? e.g. "handleBroadcast"