Completed OnResolved implementation