Fixed the sample app to work with the new framework