Updated for new schema enhancements.