Enhancements in demo