Updated to remove header macro