Changing handlers: renaming of header handler -> metadata handler + change of signature