Added more functions and support.