#216 Use headers mapping for CORS headers