Better way to handle with the headers