SSP-1147 - Template Data/Object model fixes