Updates to sample app