Added and improved APIs