Feature/en 1831

Should use options.headers?