further API updates
Further API updates