KN-5922 Enhanced sample and bit of code refactoring
KN-5922 Removed app.config