Added abstract and concrete aggregate id templates