Added two new API's and improved existing ones.