Updated source/header files