Modifications to templates