Added header files and constructor code