Added header files for non-parsing services