Added: Modifications to templates