Added more APIs 2