Adding more header files