RTGOV-623 Separate out distribution into per target and type