Added more functions, new API