Minor Modifications to templates