Use local headers instead of system