Added support for customer headers and method re-writing