Modifications to the header files