Updated sample app functionality