Added new templates and placeholders