API enhancements.