Add HEADER/SOURCE-only methods, make it more modular