Design enhancements