Added some const
Added optional origin header field