Add custom headers in the dispatcher

Depends on #18