More API Function Updates