Schema enhancements