Add and modify files from sample app for user functionaility