Fixed header file and renamed additions