Expand templates

From DSM Exceptions
Expand templates