Added data-driven template