Added support to header only