Add ResourceTimestampGroup and include at each type level