! Add heterogeneity support directly to FillableViewable