Data structure enhancements