Improved configuration options
Added viewmodel support for the sample app