Adding http headers support