Added more functions