Added custom templates feature