Adding templates and static