Demo application improvements