Fix #850: Use new templates and fix issue in writer