Added more functions to the lib