Refactore and now send client headers to server