Expand templates

From DSMN SVARGA database
Expand templates