Improve sharedheader functionality