Modifications in templates