Enhanced the sample app