Add features to API (bugs 881765, 881767)