Added combined header import and spec