Add support for optional command header part