Add some new functions and include path class