Updated sample application