Numerous API enhancements