Readded binary templates
Progress update