Added more functions and objects