Add helper method and header types