Refactor header to be common across all modules