Final modifications to templates