Added header files and updated interfaces