Added support for custom headers at the client and resource level.