Added some features for live usage.