Expand templates

From Misc Data Digs

Expand templates