Add support for template option