Product structure enhancements