Added template expander