Add in timestore pieces