Modified header files to work correctly