Added headers for server-side and templates