Added 'headerid' extension