Added more APIs