Adding inclusion of functions and some path changes