Client enhancements