Updates to sample app and features