Added more header keys
Updated context to use Option of headers
Added support for x method override via trait