Changes to common header