Updated public header files