Added more functions to Init