Improvements on internal Helpers
Improvements on internal Helpers
Demo application improvements