Demo enhancements